Import Geant4 11.4.0.beta source tree

examples/extended/parameterisations/Par04/include/Par04InferenceMessenger.hh

@@ -70,6 +70,8 @@ class Par04InferenceMessenger : public G4UImessenger
     G4UIcmdWithAString* fInferenceLibraryCmd = nullptr;
     /// Command to set fModelPathNameCmd
     G4UIcmdWithAString* fModelPathNameCmd = nullptr;
+  /// Command to set fModelTypeCmd
+  G4UIcmdWithAString *fModelTypeCmd = nullptr;
     /// Command to set the fSizeLatentVectorCmd
     G4UIcmdWithAnInteger* fSizeLatentVectorCmd = nullptr;
     /// Command to set the fSizeConditionVectorCmd

examples/extended/parameterisations/Par04/include/Par04InferenceSetup.hh

@@ -93,6 +93,10 @@ class Par04InferenceSetup
     inline void SetModelPathName(G4String aName) { fModelPathName = aName; };
     /// Get path and name of the model
     inline G4String GetModelPathName() const { return fModelPathName; };
+    /// Set model type
+    inline void SetModelType(G4String aName) { fModelType = aName; };
+    /// Get model type
+    inline G4String GetModelType() const { return fModelType; };
     /// Set profiling flag
     inline void SetProfileFlag(G4int aNumber) { fProfileFlag = aNumber; };
     /// Get profiling flag
@@ -161,7 +165,7 @@ class Par04InferenceSetup
     /// detector
     /// @param[in] aParticleEnergy Energy of initial particle
     void GetEnergies(std::vector<G4double>& aEnergies, G4double aParticleEnergy,
-                     G4float aInitialAngle);
+                   G4float aTheta, G4float aPhi);
 
     /// Calculate positions
     /// @param[out] aDepositsPositions Vector of positions corresponding to
@@ -200,6 +204,8 @@ class Par04InferenceSetup
     G4int fSizeConditionVector = 4;
     /// Name of the inference library
     G4String fModelPathName = "MLModels/Generator.onnx";
+    /// Model type
+    G4String fModelType = "VAE";
     /// ONNX specific
     /// Profiling flag
     G4bool fProfileFlag = false;

examples/extended/parameterisations/Par04/include/Par04OnnxInference.hh

@@ -28,15 +28,14 @@
 #  ifndef PAR04ONNXINFERENCE_HH
 #    define PAR04ONNXINFERENCE_HH
 #    include "Par04InferenceInterface.hh"  // for Par04InferenceInterface
-#    include "core/session/onnxruntime_cxx_api.h"  // for Env, Session, SessionO...
+#    include "onnxruntime_c_api.h"  // for OrtMemoryInfo
+#    include "onnxruntime_cxx_api.h"  // for Env, Session, SessionO...
 
 #    include <G4String.hh>  // for G4String
 #    include <G4Types.hh>  // for G4int, G4double
 #    include <memory>  // for unique_ptr
 #    include <vector>  // for vector
 
-#    include <core/session/onnxruntime_c_api.h>  // for OrtMemoryInfo
-
 /**
  * @brief Inference using the ONNX runtime.
  *