Changeset 1340 for trunk/source/tracking/src/G4SteppingManager2.cc

Timestamp:

Nov 5, 2010, 3:45:55 PM (14 years ago)

Author:

garnier

Message:

update ti head

File:

• trunk/source/tracking/src/G4SteppingManager2.cc (modified) (16 diffs)

trunk/source/tracking/src/G4SteppingManager2.cc

@@ -25 +25 @@
 //
 //
-// $Id: G4SteppingManager2.cc,v 1.37 2009/09/25 00:23:41 gum Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-01 $
+// $Id: G4SteppingManager2.cc,v 1.38 2010/07/19 13:41:21 gcosmo Exp $
+// GEANT4 tag $Name: tracking-V09-03-08 $
 //
 //---------------------------------------------------------------
@@ -50 +50 @@
 #include "G4SteppingControl.hh"
 #include "G4TransportationManager.hh"
-//#include "G4UserLimits.hh"
 #include "G4SteppingManager.hh"
 #include "G4LossTableManager.hh"
@@ -59 +58 @@
 {
 #ifdef debug
-  G4cout<<"G4SteppingManager::GetProcessNumber: is called track="<<fTrack<<G4endl;
+  G4cout<<"G4SteppingManager::GetProcessNumber: is called track="
+        <<fTrack<<G4endl;
 #endif
 
   G4ProcessManager* pm= fTrack->GetDefinition()->GetProcessManager();
-                if(!pm)
+  if(!pm)
   {
-    G4cout<<"G4SteppingManager::GetProcessNumber: ProcessManager=0 for particle="
-          <<fTrack->GetDefinition()->GetParticleName()<<", PDG_code="
-          <<fTrack->GetDefinition()->GetPDGEncoding()<<G4endl;
-                                G4Exception("G4SteppingManager::GetProcessNumber: Process Manager is not found.");
+    G4cerr << "ERROR - G4SteppingManager::GetProcessNumber()" << G4endl
+           << "        ProcessManager is NULL for particle = "
+           << fTrack->GetDefinition()->GetParticleName() << ", PDG_code = "
+           << fTrack->GetDefinition()->GetPDGEncoding() << G4endl;
+    G4Exception("G4SteppingManager::GetProcessNumber()", "Tracking0011",
+                FatalException, "Process Manager is not found.");
+    return;
   }
 
@@ -76 +79 @@
    fAtRestGetPhysIntVector = pm->GetAtRestProcessVector(typeGPIL);
 #ifdef debug
-  G4cout<<"G4SteppingManager::GetProcessNumber: #ofAtRest="<<MAXofAtRestLoops<<G4endl;
+   G4cout << "G4SteppingManager::GetProcessNumber: #ofAtRest="
+          << MAXofAtRestLoops << G4endl;
 #endif
 
@@ -84 +88 @@
    fAlongStepGetPhysIntVector = pm->GetAlongStepProcessVector(typeGPIL);
 #ifdef debug
-                        G4cout<<"G4SteppingManager::GetProcessNumber:#ofAlongStp="<<MAXofAlongStepLoops<<G4endl;
+   G4cout << "G4SteppingManager::GetProcessNumber:#ofAlongStp="
+          << MAXofAlongStepLoops << G4endl;
 #endif
 
@@ -92 +97 @@
    fPostStepGetPhysIntVector = pm->GetPostStepProcessVector(typeGPIL);
 #ifdef debug
-                        G4cout<<"G4SteppingManager::GetProcessNumber: #ofPostStep="<<MAXofPostStepLoops<<G4endl;
+   G4cout << "G4SteppingManager::GetProcessNumber: #ofPostStep="
+          << MAXofPostStepLoops << G4endl;
 #endif
 
@@ -98 +104 @@
        SizeOfSelectedDoItVector<MAXofAlongStepLoops ||
        SizeOfSelectedDoItVector<MAXofPostStepLoops  )
-                        {
-                          G4cout<<"G4SteppingManager::GetProcessNumber: SizeOfSelectedDoItVector="
-           <<SizeOfSelectedDoItVector<<" is smaller then one of MAXofAtRestLoops="
-           <<MAXofAtRestLoops<<" or MAXofAlongStepLoops="<<MAXofAlongStepLoops
-           <<" or MAXofPostStepLoops="<<MAXofPostStepLoops<<G4endl;
-                                        G4Exception("G4SteppingManager::GetProcessNumber: The array size is smaller than the actutal number of processes. Chnage G4SteppingManager.hh and recompile is needed.");
+   {
+     G4cerr << "ERROR - G4SteppingManager::GetProcessNumber()" << G4endl
+            << "        SizeOfSelectedDoItVector= " << SizeOfSelectedDoItVector
+            << " ; is smaller then one of MAXofAtRestLoops= "
+            << MAXofAtRestLoops << G4endl
+            << "        or MAXofAlongStepLoops= " << MAXofAlongStepLoops
+            << " or MAXofPostStepLoops= " << MAXofPostStepLoops << G4endl;
+     G4Exception("G4SteppingManager::GetProcessNumber()",
+                 "Tracking0012", FatalException,
+                 "The array size is smaller than the actual No of processes.");
    }
 }
@@ -144 +154 @@
 //      fStepStatus = fUserDefinedLimit;
 //      fStep->GetPostStepPoint()
-//           ->SetProcessDefinedStep(NULL);
+//           ->SetProcessDefinedStep(0);
 //      // Take note that the process pointer is 'NULL' if the Step
 //      // is defined by the user defined limit.
@@ -155 +165 @@
    for(size_t np=0; np < MAXofPostStepLoops; np++){
      fCurrentProcess = (*fPostStepGetPhysIntVector)(np);
-     if (fCurrentProcess== NULL) {
+     if (fCurrentProcess== 0) {
        (*fSelectedPostStepDoItVector)[np] = InActivated;
        continue;
@@ -225 +235 @@
    for(size_t kp=0; kp < MAXofAlongStepLoops; kp++){
      fCurrentProcess = (*fAlongStepGetPhysIntVector)[kp];
-     if (fCurrentProcess== NULL) continue;
+     if (fCurrentProcess== 0) continue;
          // NULL means the process is inactivated by a user on fly.
 
      physIntLength = fCurrentProcess->
-                     AlongStepGPIL( *fTrack,
-                                                  fPreviousStepSize,
-                                                       PhysicalStep,
-                                       safetyProposedToAndByProcess,
-                                                    &fGPILSelection );
+                     AlongStepGPIL( *fTrack, fPreviousStepSize,
+                                     PhysicalStep,
+                                     safetyProposedToAndByProcess,
+                                    &fGPILSelection );
 #ifdef G4VERBOSE
                          // !!!!! Verbose
@@ -287 +296 @@
    for( size_t ri=0 ; ri < MAXofAtRestLoops ; ri++ ){
      fCurrentProcess = (*fAtRestGetPhysIntVector)[ri];
-     if (fCurrentProcess== NULL) {
+     if (fCurrentProcess== 0) {
        (*fSelectedAtRestDoItVector)[ri] = InActivated;
        NofInactiveProc++;
@@ -294 +303 @@
 
      lifeTime =
-       fCurrentProcess->AtRestGPIL( 
-                                                     *fTrack,
-                                                &fCondition );
+       fCurrentProcess->AtRestGPIL( *fTrack, &fCondition );
 
      if(fCondition==Forced && fCurrentProcess){
@@ -305 +312 @@
        if(lifeTime < shortestLifeTime ){
           shortestLifeTime = lifeTime;
-          fAtRestDoItProcTriggered =  G4int(int(ri));
+          fAtRestDoItProcTriggered =  G4int(ri);
           (*fSelectedAtRestDoItVector)[fAtRestDoItProcTriggered] = NotForced;
        }
@@ -311 +318 @@
    }
 
-// at least one process is necessary to destory the particle  
+// at least one process is necessary to destroy the particle  
 // exit with warning 
    if(NofInactiveProc==MAXofAtRestLoops){ 
-     //     G4Exception("G4SteppingManager::InvokeAtRestDoItProcs: No AtRestDoIt process is active. " );
-     G4cerr << "G4SteppingManager::InvokeAtRestDoItProcs: No AtRestDoIt process is active. " << G4endl;
+     G4cerr << "ERROR - G4SteppingManager::InvokeAtRestDoItProcs()" << G4endl
+            << "        No AtRestDoIt process is active!" << G4endl;
+     // G4Exception("G4SteppingManager::InvokeAtRestDoItProcs", "Tracking0013",
+     //             FatalException, "No AtRestDoIt process is active." );
    }
 
@@ -401 +410 @@
    for( size_t ci=0 ; ci<MAXofAlongStepLoops ; ci++ ){
      fCurrentProcess = (*fAlongStepDoItVector)[ci];
-     if (fCurrentProcess== NULL) continue;
+     if (fCurrentProcess== 0) continue;
          // NULL means the process is inactivated by a user on fly.
 
@@ -577 +586 @@
   G4int tPtclIdx
     = G4ProductionCuts::GetIndex(aSecondary->GetDefinition());
+  if (tPtclIdx<0)  { return; }
   G4ProductionCutsTable* tCutsTbl
     = G4ProductionCutsTable::GetProductionCutsTable();