Changeset 1347 for trunk/source/processes/hadronic/models/binary_cascade/src/G4BinaryCascade.cc

Timestamp:

Dec 22, 2010, 3:52:27 PM (13 years ago)

Author:

garnier

Message:

geant4 tag 9.4

File:

• trunk/source/processes/hadronic/models/binary_cascade/src/G4BinaryCascade.cc (modified) (12 diffs)

trunk/source/processes/hadronic/models/binary_cascade/src/G4BinaryCascade.cc

@@ -152 +152 @@
 {
   static G4int eventcounter=0;
+  
+//   if ( eventcounter == 0 ) {
+//      SetEpReportLevel(3);   // report non conservation with model etc.
+//      G4double relativeLevel = 1*perCent;
+//      G4double absoluteLevel = 2*MeV;
+//      SetEnergyMomentumCheckLevels(relativeLevel,absoluteLevel); 
+//   }
+  
   //if(eventcounter == 100*(eventcounter/100) )
   eventcounter++;
@@ -278 +286 @@
    G4cout << "G4BinaryCascade Propagate starting -------------------------------------------------------" <<G4endl;
 #endif
+
+   // *GF* FIXME ? in propagate mode this test is wrong! Could be in Apply....
+  if(nucleus->GetMassNumber() == 1) // 1H1 is special case
+  {
+      #ifdef debug_BIC_Propagate
+          G4cout << " special case 1H1.... " << G4endl;
+      #endif
+     return Propagate1H1(secondaries,nucleus);
+  }
+
   G4ReactionProductVector * products = new G4ReactionProductVector;
   the3DNucleus = nucleus;
@@ -289 +307 @@
   ClearAndDestroy(&theFinalState);
   std::vector<G4KineticTrack *>::iterator iter;
-
-   // *GF* FIXME ? in propagate mode this test is wrong! Could be in Apply....
-  if(nucleus->GetMassNumber() == 1) // 1H1 is special case
-  {
-      #ifdef debug_BIC_Propagate
-          G4cout << " special case 1H1.... " << G4endl;
-      #endif
-     return Propagate1H1(secondaries,nucleus);
-  }
 
   BuildTargetList();
@@ -1068 +1077 @@
      PrintKTVector(&target_collection,std::string("... targets"));
 //*GF*     throw G4HadronicException(__FILE__, __LINE__, "G4BinaryCasacde::ApplyCollision()");
-#else
+#endif
      return false;
-#endif
   }
 
@@ -1117 +1125 @@
   G4KineticTrackVector * products=0;
   products = collision->GetFinalState();
+
+  G4bool lateParticleCollision= (!haveTarget) && products && products->size() == 1;
 
   #ifdef debug_BIC_ApplyCollision
@@ -1139 +1149 @@
            PrintKTVector(&collision->GetTargetCollection(),std::string(" Target particles"));
       }  
-   #endif
-     G4bool lateParticleCollision= (!haveTarget) && products && products->size() == 1;
         //  if ( lateParticleCollision ) G4cout << " Added late particle--------------------------"<<G4endl;
         //  if ( lateParticleCollision && products ) PrintKTVector(products, " reaction products");
+   #endif
 //****************************************  
 
@@ -1561 +1570 @@
       {
           nsec++;
-          G4double tStep(0), tdummy(0); 
-          ((G4RKPropagation*)thePropagator)->GetSphereIntersectionTimes(kt,tdummy,tStep);
+          G4double tStep(0), tdummy(0);
+          G4bool intersect = 
+               ((G4RKPropagation*)thePropagator)->GetSphereIntersectionTimes(kt,tdummy,tStep); 
 #ifdef debug_BIC_StepParticlesOut
           G4cout << " minTimeStep, tStep Particle " <<minTimeStep << " " <<tStep
                  << " " <<kt->GetDefinition()->GetParticleName() 
                  << " 4mom " << kt->GetTrackingMomentum()<<G4endl;
-#endif
-          if(tStep<minTimeStep && tStep> 0 )
+          if ( ! intersect );
+          {
+             PrintKTVector(&theSecondaryList, std::string(" state ERROR....."));
+             throw G4HadronicException(__FILE__, __LINE__, "G4BinaryCascade::StepParticlesOut() particle not in nucleus");
+          }
+#endif
+          if(intersect && tStep<minTimeStep && tStep> 0 )
           {
             minTimeStep = tStep;
@@ -2462 +2477 @@
     }
     size_t current(0);
-    for(current=0; current<secs->size(); current++)
+    for(current=0; secs && current<secs->size(); current++)
     {
       if((*secs)[current]->GetDefinition()->IsShortLived())
@@ -2708 +2723 @@
                                           G4KineticTrackVector * products)
 {
-  G4RKPropagation * RKprop=(G4RKPropagation *)thePropagator;
 
   G4KineticTrackVector debug1;
@@ -2716 +2730 @@
   PrintKTVector(products,std::string(" Scatterer products"));
   
+#ifdef dontUse
   G4double thisExcitation(0);
 //  excitation energy from this collision
@@ -2722 +2737 @@
   G4KineticTrack * kt=collision->GetPrimary();
   initial +=  kt->Get4Momentum().e();
+
+  G4RKPropagation * RKprop=(G4RKPropagation *)thePropagator;
   
   initial +=  RKprop->GetField(kt->GetDefinition()->GetPDGEncoding(),kt->GetPosition());
@@ -2789 +2806 @@
          << G4endl;
    currentInitialEnergy-=final;  
-
+#endif
 }