Import Geant4 10.7.0.beta source tree

source/processes/scoring/History

@@ -16,6 +16,14 @@ committal in the CVS repository !
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
 
+May 13, 2020, M. Asai (procscore-V10-06-01)
+- G4ParallelWorldProcess.hh: make some private methods and data members
+  protected so that this class can be extendable.
+
+February 10, 2020, V. Ivanchenko (procscore-V10-06-00)
+- G4ParallelWorldProcess.cc, G4ParallelWorldScoringProcess.cc 
+  - use new PDG code for optical photon "-22"
+
 November 24, 2018, M. Asai (procscore-V10-04-01)
 - G4ParallelWorldProcess.cc
   - Fix the track velocity of optical photon for the first step

source/processes/scoring/include/G4ParallelWorldProcess.hh

@@ -125,7 +125,7 @@ public: // with description
   inline G4bool GetLayeredMaterialFlag() const
   { return layeredMaterialFlag; }
 
-private:
+protected:
   void CopyStep(const G4Step & step);
   void SwitchMaterial(G4StepPoint*);
 
@@ -135,7 +135,7 @@ public: // with description
   //--------------------------------------------------------------------
   G4bool IsAtRestRequired(G4ParticleDefinition*);
 
-private:
+protected:
   G4Step * fGhostStep;
   G4StepPoint * fGhostPreStepPoint;
   G4StepPoint * fGhostPostStepPoint;

source/processes/scoring/src/G4ParallelWorldProcess.cc

@@ -432,21 +432,15 @@ G4bool G4ParallelWorldProcess::IsAtRestRequired(G4ParticleDefinition* partDef)
   if(pdgCode==0)
   {
     G4String partName = partDef->GetParticleName();
-    if(partName=="opticalphoton") return false;
     if(partName=="geantino") return false;
     if(partName=="chargedgeantino") return false;
   }
   else
   {
-    if(pdgCode==22) return false; // gamma
-    if(pdgCode==11) return false; // electron
-    if(pdgCode==2212) return false; // proton
-    if(pdgCode==-12) return false; // anti_nu_e
-    if(pdgCode==12) return false; // nu_e
-    if(pdgCode==-14) return false; // anti_nu_mu
-    if(pdgCode==14) return false; // nu_mu
-    if(pdgCode==-16) return false; // anti_nu_tau
-    if(pdgCode==16) return false; // nu_tau
+    if(pdgCode==11 || pdgCode==2212) return false; // electrons and proton
+    pdgCode = std::abs(pdgCode);
+    if(pdgCode==22) return false; // gamma and optical photons
+    if(pdgCode==12 || pdgCode==14 || pdgCode==16) return false; // all neutronos
   }
   return true;
 }

source/processes/scoring/src/G4ParallelWorldScoringProcess.cc

@@ -116,21 +116,15 @@ IsAtRestRequired(G4ParticleDefinition* partDef)
   if(pdgCode==0)
   {
     G4String partName = partDef->GetParticleName();
-    if(partName=="opticalphoton") return false;
     if(partName=="geantino") return false;
     if(partName=="chargedgeantino") return false;
   }
   else
   {
-    if(pdgCode==22) return false; // gamma
-    if(pdgCode==11) return false; // electron
-    if(pdgCode==2212) return false; // proton
-    if(pdgCode==-12) return false; // anti_nu_e
-    if(pdgCode==12) return false; // nu_e
-    if(pdgCode==-14) return false; // anti_nu_mu
-    if(pdgCode==14) return false; // nu_mu
-    if(pdgCode==-16) return false; // anti_nu_tau
-    if(pdgCode==16) return false; // nu_tau
+    if(pdgCode==11 || pdgCode==2212) return false; // electrons and proton
+    pdgCode = std::abs(pdgCode);
+    if(pdgCode==22) return false; // gamma and optical photons
+    if(pdgCode==12 || pdgCode==14 || pdgCode==16) return false; // all neutronos
   }
   return true;
 }