Import Geant4 11.2.0.beta source tree

source/persistency/gdml/include/G4GDMLMessenger.hh

@@ -61,6 +61,7 @@ class G4GDMLMessenger : public G4UImessenger
 
     G4UIdirectory* persistencyDir = nullptr;
     G4UIdirectory* gdmlDir = nullptr;
+    G4UIcmdWithAString* ReaderSchema = nullptr;
     G4UIcmdWithAString* ReaderCmd = nullptr;
     G4UIcmdWithAString* WriterCmd = nullptr;
     G4UIcmdWithAString* TopVolCmd = nullptr;

source/persistency/gdml/include/G4GDMLParser.hh

@@ -125,6 +125,7 @@ class G4GDMLParser
     inline void SetEnergyCutsExport(G4bool);
     inline void SetSDExport(G4bool);
     inline void SetReverseSearch(G4bool);
+    inline void SetImportSchema(const G4String& path_and_filename);
 
     inline G4int GetMaxExportLevel() const;  // Manage max number of levels
     inline void SetMaxExportLevel(G4int);    // to export

source/persistency/gdml/include/G4GDMLParser.icc

@@ -249,6 +249,11 @@ inline void G4GDMLParser::Clear()
   reader->Clear();
 }
 
+inline void G4GDMLParser::SetImportSchema(const G4String& path_and_filename)
+{
+  reader->SetSchemaFile(path_and_filename);
+}
+
 // --------------------------------------------------------------------
 // Methods for Writer
 // --------------------------------------------------------------------

source/persistency/gdml/include/G4GDMLRead.hh

@@ -131,6 +131,11 @@ class G4GDMLRead
     //
     // Strip off pointers from entity IDs.
 
+    const G4String& GetSchemaFile() const;
+    void SetSchemaFile(const G4String& schemaFile);
+    //
+    // Set/Get alternative XML schema path/file for parsing validation.
+
     void OverlapCheck(G4bool);
     //
     // Activate/de-activate surface check for overlaps (default is off).
@@ -157,6 +162,7 @@ class G4GDMLRead
     G4bool validate = true;
     G4bool check = false;
     G4bool dostrip = true;
+    G4String schema = "";
 
   private: