Import Geant4 10.3.0.beta source tree

source/physics_lists/constructors/electromagnetic/include/G4EmDNAPhysics_option7.hh

@@ -26,8 +26,8 @@
 // S. Incerti (incerti@cenbg.in2p3.fr)
 //
 
-#ifndef G4EmDNAPhysics_option5_h
-#define G4EmDNAPhysics_option5_h 1
+#ifndef G4EmDNAPhysics_option7_h
+#define G4EmDNAPhysics_option7_h 1
 
 #include "G4VPhysicsConstructor.hh"
 #include "globals.hh"

source/physics_lists/constructors/electromagnetic/include/G4OpticalPhysics.hh

@@ -90,11 +90,14 @@ class G4OpticalPhysics : public G4VPhysicsConstructor
 
     void SetWLSTimeProfile(G4String );
     void SetScintillationByParticleType(G4bool );
+    void SetScintillationTrackInfo(G4bool );
     //void AddScintillationSaturation(G4EmSaturation* );
 
     void SetTrackSecondariesFirst(G4OpticalProcessIndex, G4bool );
     void SetFiniteRiseTime(G4bool );
 
+    void SetInvokeSD(G4bool );
+
   private:
 
     // methods
@@ -135,6 +138,14 @@ class G4OpticalPhysics : public G4VPhysicsConstructor
     /// light emission in scintillators
     G4bool                      fScintillationByParticleType;
 
+    /// option to allow for G4ScintillationTrackInformation
+    /// to be attached to a scintillation photon's track
+    G4bool                      fScintillationTrackInfo;
+
+    /// option to allow for G4OpBoundaryProcess
+    /// to call/not call InvokeSD method
+    G4bool                      fInvokeSD;
+
 };
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

source/physics_lists/constructors/electromagnetic/include/G4OpticalPhysicsMessenger.hh

@@ -69,6 +69,7 @@ class G4UIcommand;
 // - /process/optical/defaults/scintillation/setByParticleType val
 // - /process/optical/defaults/scintillation/setFiniteRiseTime val
 // - /process/optical/defaults/wls/setTimeProfile val
+// - /process/optical/defaults/boundary/setInvokeSD flag
 
 class G4OpticalPhysicsMessenger: public G4UImessenger
 {
@@ -120,6 +121,9 @@ private:
   /// setScintillationByParticleType command
   G4UIcmdWithABool*      fSetScintillationByParticleTypeCmd;
 
+  /// setScintillationTrackInfo command
+  G4UIcmdWithABool*      fSetScintillationTrackInfoCmd;
+
 //  /// setOpticalSurfaceModel command
 //  G4UIcmdWithAString*    fSetOpticalSurfaceModelCmd;
 
@@ -132,6 +136,9 @@ private:
   /// setFiniteRiseTime command
   G4UIcmdWithABool*      fSetFiniteRiseTimeCmd;
 
+  /// setInvokeSD command
+  G4UIcmdWithABool*      fSetInvokeSDCmd;
+
 };
 
 #endif // G4OpticalPhysicsMessenger_h