Import Geant4 10.1.0 source tree

source/processes/management/History

@@ -1,4 +1,4 @@
-$Id: History 75600 2013-11-04 13:03:02Z gcosmo $
+$Id: History 82045 2014-06-10 08:09:15Z gcosmo $
 -------------------------------------------------------------------
 
      =========================================================
@@ -17,6 +17,17 @@ committal in the CVS repository !
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
 
+- June 6th, 2014    P.Gumplinger (procman-V10-00-02)
+- Add new process type fUCN in G4ProcessType.hh
+
+- May 12th, 2014    A.Dotti     (procman-V10-00-01)
+- Fixing bug #1625: G4WrapperProcess not correctly 
+  forwards call to SetMasterProcess to wrapped process. 
+  Needed for MT.
+
+- Jan. 23rd, 2014   H.Kurashige (procman-V10-00-00)
+- Fix compiler warning in G4ProcessTable.cc
+
 - Oct. 30th, 2013   M.Kelsey (procman-V09-06-07)
 - Add fPhonon to G4VProcess::GetProcessTypeName() [should have done it below]
 

source/processes/management/include/G4ProcessType.hh

@@ -24,7 +24,7 @@
 // ********************************************************************
 //
 //
-// $Id: G4ProcessType.hh 75164 2013-10-29 08:55:08Z gcosmo $
+// $Id: G4ProcessType.hh 82045 2014-06-10 08:09:15Z gcosmo $
 //
 //
 //---------------------------------------------------------------
@@ -53,7 +53,8 @@ enum G4ProcessType
   fParameterisation,
   fUserDefined,
   fParallel,
-  fPhonon
+  fPhonon,
+  fUCN
 };
 #endif
 

source/processes/management/include/G4WrapperProcess.hh

@@ -24,7 +24,7 @@
 // ********************************************************************
 //
 //
-// $Id: G4WrapperProcess.hh 71231 2013-06-12 13:06:28Z gcosmo $
+// $Id: G4WrapperProcess.hh 80787 2014-05-12 09:06:07Z gcosmo $
 //
 // 
 // ------------------------------------------------------------
@@ -178,7 +178,8 @@ class G4WrapperProcess : public G4VProcess
    public:
       virtual void      ResetNumberOfInteractionLengthLeft();
       // reset (determine the value of)NumberOfInteractionLengthLeft
-
+      virtual void SetMasterProcess(G4VProcess* masterP);
+     // Needed for MT, forward call to underlying process 
 };
 
 inline

source/processes/management/src/G4ProcessTable.cc

@@ -24,7 +24,7 @@
 // ********************************************************************
 //
 //
-// $Id: G4ProcessTable.cc 71231 2013-06-12 13:06:28Z gcosmo $
+// $Id: G4ProcessTable.cc 78775 2014-01-23 11:23:25Z gcosmo $
 //
 // 
 // ------------------------------------------------------------
@@ -364,12 +364,12 @@ G4ProcessTable::G4ProcTableVector* G4ProcessTable::Find(
     }
   }
 
-#ifdef G4VERBOSE
   if (!isFound && verboseLevel>0){
+#ifdef G4VERBOSE
     G4cout << " G4ProcessTable::Find :" ;
     G4cout << " The Process[" << processName << "] is not found  " << G4endl;
-  }
 #endif
+  }
   
   return tmpTblVector;
 
@@ -393,12 +393,12 @@ G4ProcessTable::G4ProcTableVector* G4ProcessTable::Find(
     }
   }
 
-#ifdef G4VERBOSE
   if (!isFound && verboseLevel>0){
+#ifdef G4VERBOSE
     G4cout << " G4ProcessTable::Find :" ;
     G4cout << " The ProcessType[" << processType << "] is not found  " << G4endl;
-  }
 #endif
+  }
   
   return tmpTblVector;
 

source/processes/management/src/G4WrapperProcess.cc

@@ -24,7 +24,7 @@
 // ********************************************************************
 //
 //
-// $Id: G4WrapperProcess.cc 71231 2013-06-12 13:06:28Z gcosmo $
+// $Id: G4WrapperProcess.cc 80787 2014-05-12 09:06:07Z gcosmo $
 //
 // 
 // ------------------------------------------------------------
@@ -169,3 +169,10 @@ const G4VProcess* G4WrapperProcess::GetRegisteredProcess() const
 {
   return pRegProcess;
 } 
+
+void G4WrapperProcess::SetMasterProcess(G4VProcess* masterP) {
+  G4WrapperProcess* master = static_cast<G4WrapperProcess*>(masterP);
+  //Cannot use getter because it returns "const" and we do not want
+  //to cast away constness explicitly (even if this is the same)
+  pRegProcess->SetMasterProcess(master->pRegProcess);
+}