Changeset 1315 for trunk/source/geometry/navigation

Timestamp:

Jun 18, 2010, 11:42:07 AM (15 years ago)

Author:

garnier

Message:

update geant4-09-04-beta-cand-01 interfaces-V09-03-09 vis-V09-03-08

Location:

trunk/source/geometry/navigation

Files:

• History (modified) (2 diffs)
• src/G4PropagatorInField.cc (modified) (11 diffs)

trunk/source/geometry/navigation/History

@@ -1 @@
-$Id: History,v 1.138 2009/12/11 05:48:53 japost Exp $
+$Id: History,v 1.139 2010/03/08 13:57:48 gcosmo Exp $
 -------------------------------------------------------------------
 
@@ -17 +17 @@
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
-Dec 11th, 2009 - J.Apostolakis (geomnav-V09-02-11)
-------------------------------
-- G4PropagatorInField
-  * Implementation field by Region 
-      - with extra checking of logical volume
-
-Nov 30th, 2009 - J.Apostolakis (geomnav-V09-02-10)
-------------------------------
-- G4VIntersectionLocator
-  * Fix problem in ReEstimateEndPoint() behaviour for very small steps.
-
-  * Corrected constructor to ensure that it initialises all data members.
-  * Labelled the methods (in header) to make noticable those that 
-      must changed at every step.
-      ( attributes: ChordFinder,  EpsilonStep,  Navigator )
+
+March 8th, 2010 - G.Cosmo (geomnav-V09-03-00)
+-------------------------
+- Avoid unnecessary creation of string for debug purposes in G4PropagatorInField.
+  Courtesy of P.Elmer (CMS).
+- Some printout formatting...
+
+December 11th, 2009 - J.Apostolakis (geomnav-V09-02-11)
+-----------------------------------
+- Implemented field by region in G4PropagatorInField, with extra checking of
+  logical volume.
+
+November 30th, 2009 - J.Apostolakis (geomnav-V09-02-10)
+-----------------------------------
+- Fixes in G4VIntersectionLocator:
+   * Fixed problem in ReEstimateEndPoint() behaviour for very small steps.
+   * Corrected constructor to ensure that it initialises all data members.
+   * Labelled the methods (in header) to make noticable those that must change
+     at every step (attributes: 'ChordFinder', 'EpsilonStep', 'Navigator').
 
 Nov 23rd, 2009 - J.Apostolakis 
 ------------------------------
-- Fixed G4PropagatorInField.cc: 
-   * Revise condition for flagging ZeroStep to avoid fake triggering.
-     Small proposed steps (from Physics) could trigger the previous
-     simple condition for Tiny/Zero Problem steps.
-   [ This was first commited on branch geomnav-V09-02-08_branch 
-       and tagged geomnav-V09-02-80  ]
-
-Nov 12th, 2009 - J.Apostolakis (geomnav-V09-02-09)
-------------------------------
-- G4PropagatorInField: cleanup of minor methods:
-   Added new method RefreshIntersectionLocator to update the state of
-       Use this method to synchronise with IntersectionLocator.
-   Deleted long obsolete methods: SetAccuraciesWithDeltaOneStep
-           SetDeltaIntersection,  SetDeltaOneStep
-   Revised implementation to avoid using the older methods
-           GetDeltaIntersection   GetDeltaOneStep
-
-Nov 12th, 2009 - J.Apostolakis (geomnav-V09-02-08)
-------------------------------
+- Fixes in G4PropagatorInField.cc: 
+   * Revised condition for flagging ZeroStep to avoid fake triggering. Small
+     proposed steps (from Physics) could trigger the previous simple condition
+     for Tiny/Zero Problem steps.
+
+November 12th, 2009 - J.Apostolakis (geomnav-V09-02-09)
+-----------------------------------
+- Cleanup of minor methods in G4PropagatorInField:
+   * Added new method RefreshIntersectionLocator() to update the state of locator.
+     It is used to synchronise with G4IntersectionLocator.
+   * Deleted long obsolete methods: SetAccuraciesWithDeltaOneStep(),
+     SetDeltaIntersection() and SetDeltaOneStep().
+   * Revised implementation to avoid using the older methods GetDeltaIntersection()
+     and GetDeltaOneStep().
+
+November 12th, 2009 - J.Apostolakis (geomnav-V09-02-08)
+-----------------------------------
 - Refined G4PropagatorInField.cc: 
    * Changed parameters for treating consecutive tiny/zero steps:
      - the value of default decrease factor to 0.25 (from 0.1), 
-     - the value is not used when the step size falls below a certain threshold.s
-       This threshold is changed. It is expressed as a multiple of fZeroStepThreshold 
-       instead of kCarTolerance.  The reasons are:
-         * the threshold were meant to refer to the  ZeroStepThreshold (it was kCarTolerance)
-         * the values were now much larger than this ZeroStepThreshold.
-     - The value given to the decrease factor after the first such thresholds is changed to 0.35
-       instead of 0.25, 0.5.  
+     - the value is not used when the step size falls below a certain thresholds
+       This threshold is changed. It is expressed as a multiple of fZeroStepThreshold
+       instead of kCarTolerance. This, since the thresholds were meant to refer to
+       the  ZeroStepThreshold (it was kCarTolerance), and the values were now much
+       larger than 'ZeroStepThreshold'.
+     - The value given to the decrease factor after the first such thresholds is
+       changed to 0.35 instead of 0.25, 0.5.  
    * Improved printing of Diagnostic message.
 
-Nov  3rd, 2009 - J.Apostolakis (geomnav-V09-02-07)
-------------------------------
+November 3rd, 2009 - J.Apostolakis (geomnav-V09-02-07)
+----------------------------------
 - Refined G4PropagatorInField.cc: 
-   * Added new member fZeroStepThreshold, to enable tuning of threshold for Tiny/Zero steps. 
+   * Added new member fZeroStepThreshold, to enable tuning of threshold for
+     Tiny/Zero steps. 
    * Changed default value from 0.5 * kCarTolerance 
-                          to max (100,000 * kCarTolerance, 0.1 * micron )
-   * This is first revision to address problem seen at boundary of volumes (Reports of Atlas) .
+     to max (100,000 * kCarTolerance, 0.1 * micron )
+   * This is first revision to address problem seen at boundary of volumes
+     (Reports of ATLAS).
 
 June 2nd, 2009 - J.Apostolakis (geomnav-V09-02-06)

trunk/source/geometry/navigation/src/G4PropagatorInField.cc

@@ -36 +36 @@
 // 17.03.97 John Apostolakis,   renaming new set functions being added
 //
-// $Id: G4PropagatorInField.cc,v 1.50 2009/12/10 08:41:54 japost Exp $
+// $Id: G4PropagatorInField.cc,v 1.51 2010/03/08 13:57:34 gcosmo Exp $
 // GEANT4 tag $ Name:  $
 // ---------------------------------------------------------------------------
@@ -129 +129 @@
                 G4double&          currentSafety,                // IN/OUT
                 G4VPhysicalVolume* pPhysVol)
-{
-  const G4String MethodName("G4PropagatorInField::ComputeStep");
-   
+{  
   // If CurrentProposedStepLength is too small for finding Chords
   // then return with no action (for now - TODO: some action)
@@ -238 +236 @@
 
 #ifdef G4DEBUG_FIELD
-     G4cout << MethodName << ": " 
-            << " Decreasing step -  " 
+     G4cout << " G4PropagatorInField::ComputeStep(): " << G4endl
+            << "  Decreasing step -  " 
             << " decreaseFactor= " << std::setw(8) << decreaseFactor 
             << " stepTrial = "     << std::setw(18) << stepTrial << " "
@@ -248 +246 @@
      if( stepTrial == 0.0 )  //  Change to make it < 0.1 * kCarTolerance ??
      {
-       G4cout << " G4PropagatorInField::ComputeStep "
-              << " Particle abandoned due to lack of progress in field."
+       G4cout << " G4PropagatorInField::ComputeStep(): " << G4endl
+              << "  Particle abandoned due to lack of progress in field."
               << G4endl
-              << " Properties : " << pFieldTrack << " "
+              << "  Properties : " << pFieldTrack << " "
               << G4endl;
-       G4cerr << " G4PropagatorInField::ComputeStep "
-              << "  ERROR : attempting a zero step= " << stepTrial << G4endl
-              << " while attempting to progress after " << fNoZeroStep
-              << " trial steps.  Will abandon step." << G4endl;
+       G4cerr << " G4PropagatorInField::ComputeStep() - ERROR " << G4endl
+              << "  Attempting a zero step = " << stepTrial << G4endl
+              << "  while attempting to progress after " << fNoZeroStep
+              << " trial steps. Will abandon step." << G4endl;
          fParticleIsLooping= true;
          return 0;  // = stepTrial;
@@ -351 +349 @@
     if( (fVerboseLevel > 1) && (do_loop_count > fMax_loop_count-10 )) {
       if( do_loop_count == fMax_loop_count-9 ){
-        G4cout << "G4PropagatorInField::ComputeStep "
-               << " Difficult track - taking many sub steps." << G4endl;
+        G4cout << " G4PropagatorInField::ComputeStep(): " << G4endl
+               << "  Difficult track - taking many sub steps." << G4endl;
       }
       printStatus( SubStepStartState, CurrentState, CurrentProposedStepLength, 
@@ -369 +367 @@
     fParticleIsLooping = true;
 
-    if ( fVerboseLevel > 0 ){
-       G4cout << "G4PropagateInField: Killing looping particle " 
+    if ( fVerboseLevel > 0 )
+    {
+       G4cout << " G4PropagateInField::ComputeStep(): " << G4endl
+              << "  Killing looping particle " 
               // << " of " << energy  << " energy "
               << " after " << do_loop_count << " field substeps "
               << " totaling " << StepTaken / mm << " mm " ;
        if( pPhysVol )
-          G4cout << " in the volume " << pPhysVol->GetName() ; 
+          G4cout << " in volume " << pPhysVol->GetName() ; 
        else
          G4cout << " in unknown or null volume. " ; 
@@ -401 +401 @@
       - End_PointAndTangent.GetCurveLength()) > 3.e-4 * TruePathLength )
   {
-    G4cerr << " ERROR - G4PropagatorInField::ComputeStep():" << G4endl
-           << " Curve length mis-match, is advancement wrong ? " << G4endl;
-    G4cerr << " The curve length of the endpoint should be: " 
+    G4cerr << " G4PropagatorInField::ComputeStep() - ERROR" << G4endl
+           << "  Curve length mis-match, is advancement wrong ? " << G4endl;
+    G4cerr << "  The curve length of the endpoint should be: " 
            << OriginalState.GetCurveLength() + TruePathLength << G4endl
-           << " and it is instead: "
+           << "  and it is instead: "
            << End_PointAndTangent.GetCurveLength() << "." << G4endl
-           << " A difference of: "
+           << "  A difference of: "
            << OriginalState.GetCurveLength() + TruePathLength 
               - End_PointAndTangent.GetCurveLength() << G4endl;
-    G4cerr << " Original state= " << OriginalState   << G4endl
-           << " Proposed state= " << End_PointAndTangent << G4endl;
-    G4Exception("G4PropagatorInField::ComputeStep()", "IncorrectProposedEndPoint",
-                FatalException, 
+    G4cerr << "  Original state = " << OriginalState   << G4endl
+           << "  Proposed state = " << End_PointAndTangent << G4endl;
+    G4Exception("G4PropagatorInField::ComputeStep()",
+                "IncorrectProposedEndPoint", FatalException, 
                 "Curve length mis-match between original state and proposed endpoint of propagation.");
   }
@@ -434 +434 @@
   }
 
-  if( fNoZeroStep > fAbandonThreshold_NoZeroSteps ) { 
+  if( fNoZeroStep > fAbandonThreshold_NoZeroSteps )
+  { 
      fParticleIsLooping = true;
-     G4cout << " WARNING - G4PropagatorInField::ComputeStep():" << G4endl
-            << " Zero progress for "  << fNoZeroStep << " attempted steps." 
+     G4cout << " G4PropagatorInField::ComputeStep() - WARNING" << G4endl
+            << "  Zero progress for "  << fNoZeroStep << " attempted steps." 
             << G4endl;
-     G4cout << "Proposed Step is "<<CurrentProposedStepLength <<" but Step Taken is "<< fFull_CurveLen_of_LastAttempt <<G4endl;
-     G4cout << "For Particle with Charge ="<<fCharge
-            << " Momentum="<< fInitialMomentumModulus<<" Mass="<< fMass<<G4endl;
+     G4cout << "  Proposed Step is " << CurrentProposedStepLength
+            << " but Step Taken is "<< fFull_CurveLen_of_LastAttempt << G4endl;
+     G4cout << "  For Particle with Charge = " << fCharge
+            << " Momentum = "<< fInitialMomentumModulus
+            << " Mass = " << fMass << G4endl;
        if( pPhysVol )
-          G4cout << " in the volume " << pPhysVol->GetName() ; 
+         G4cout << " in volume " << pPhysVol->GetName() ; 
        else
          G4cout << " in unknown or null volume. " ; 
        G4cout << G4endl;
      if ( fVerboseLevel > 2 )
-       G4cout << " Particle that is stuck will be killed." << G4endl;
+       G4cout << " Particle is stuck; it will be killed." << G4endl;
      fNoZeroStep = 0; 
   }
@@ -558 +561 @@
        
      G4cout << "Step taken was " << step_len  
-            << " out of PhysicalStep= " <<  requestStep << G4endl;
+            << " out of PhysicalStep = " <<  requestStep << G4endl;
      G4cout << "Final safety is: " << safety << G4endl;
 
@@ -579 +582 @@
 {
 #if 0
-  G4cout << " PiF: NoZeroStep= " << fNoZeroStep
-         << " CurrentProposedStepLength= " << CurrentProposedStepLength
-         << " Full_curvelen_last=" << fFull_CurveLen_of_LastAttempt
-         << " last proposed step-length= " << fLast_ProposedStepLength 
+  G4cout << " PiF: NoZeroStep = " << fNoZeroStep
+         << " CurrentProposedStepLength = " << CurrentProposedStepLength
+         << " Full_curvelen_last =" << fFull_CurveLen_of_LastAttempt
+         << " last proposed step-length = " << fLast_ProposedStepLength 
          << " decrease factor = " << decreaseFactor
          << " step trial = " << stepTrial
@@ -698 +701 @@
   //
   G4MagInt_Driver* integrDriver= GetChordFinder()->GetIntegrationDriver(); 
-  integrDriver->SetVerboseLevel( fVerboseLevel - 2 ); 
+  integrDriver->SetVerboseLevel( fVerboseLevel - 2 );
   G4cout << "Set Driver verbosity to " << fVerboseLevel - 2 << G4endl;