Changeset 1228 for trunk/source/geometry/navigation/src

Timestamp:

Jan 8, 2010, 11:56:51 AM (14 years ago)

Author:

garnier

Message:

update geant4.9.3 tag

Location:

trunk/source/geometry/navigation/src

Files:

• G4AuxiliaryNavServices.cc (modified) (1 diff)
• G4BrentLocator.cc (modified) (1 diff)
• G4DrawVoxels.cc (modified) (1 diff)
• G4ErrorPropagationNavigator.cc (modified) (1 diff)
• G4GeomTestErrorList.cc (modified) (1 diff)
• G4GeomTestOverlapList.cc (modified) (1 diff)
• G4GeomTestOvershootList.cc (modified) (1 diff)
• G4GeomTestPoint.cc (modified) (1 diff)
• G4GeomTestSegment.cc (modified) (1 diff)
• G4GeomTestStreamLogger.cc (modified) (1 diff)
• G4GeomTestVolPoint.cc (modified) (1 diff)
• G4GeomTestVolume.cc (modified) (1 diff)
• G4GeometryMessenger.cc (modified) (1 diff)
• G4MultiLevelLocator.cc (modified) (1 diff)
• G4NormalNavigation.cc (modified) (1 diff)
• G4ParameterisedNavigation.cc (modified) (1 diff)
• G4PropagatorInField.cc (modified) (13 diffs)
• G4ReplicaNavigation.cc (modified) (1 diff)
• G4SimpleLocator.cc (modified) (1 diff)
• G4TransportationManager.cc (modified) (1 diff)
• G4VIntersectionLocator.cc (modified) (3 diffs)
• G4VoxelNavigation.cc (modified) (1 diff)

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

@@ -25 +25 @@
 //
 // $Id: G4AuxiliaryNavServices.cc,v 1.3 2006/06/29 18:36:32 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // --------------------------------------------------------------------

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

@@ -25 +25 @@
 //
 // $Id: G4BrentLocator.cc,v 1.8 2009/05/15 12:55:48 tnikitin Exp $
-// GEANT4 tag $Name: geant4-09-03-beta-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Class G4BrentLocator implementation

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

@@ -26 +26 @@
 //
 // $Id: G4DrawVoxels.cc,v 1.4 2006/06/29 18:36:34 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-beta-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 

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

@@ -26 +26 @@
 //
 // $Id: G4ErrorPropagationNavigator.cc,v 1.2 2008/10/24 14:00:03 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //

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

@@ -26 +26 @@
 //
 // $Id: G4GeomTestErrorList.cc,v 1.3 2006/06/29 18:36:36 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // --------------------------------------------------------------------

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

@@ -26 +26 @@
 //
 // $Id: G4GeomTestOverlapList.cc,v 1.3 2006/06/29 18:36:39 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // --------------------------------------------------------------------

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

@@ -26 +26 @@
 //
 // $Id: G4GeomTestOvershootList.cc,v 1.3 2006/06/29 18:36:41 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // --------------------------------------------------------------------

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

@@ -26 +26 @@
 //
 // $Id: G4GeomTestPoint.cc,v 1.3 2006/06/29 18:36:44 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // --------------------------------------------------------------------

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

@@ -26 +26 @@
 //
 // $Id: G4GeomTestSegment.cc,v 1.11 2007/11/16 09:39:14 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // --------------------------------------------------------------------

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

@@ -26 +26 @@
 //
 // $Id: G4GeomTestStreamLogger.cc,v 1.3 2006/06/29 18:36:49 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // --------------------------------------------------------------------

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

@@ -26 +26 @@
 //
 // $Id: G4GeomTestVolPoint.cc,v 1.3 2006/06/29 18:36:52 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // --------------------------------------------------------------------

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

@@ -26 +26 @@
 //
 // $Id: G4GeomTestVolume.cc,v 1.6 2007/11/16 09:39:14 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // --------------------------------------------------------------------

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

@@ -26 +26 @@
 //
 // $Id: G4GeometryMessenger.cc,v 1.5 2006/06/29 18:36:57 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // --------------------------------------------------------------------

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

@@ -25 +25 @@
 //
 // $Id: G4MultiLevelLocator.cc,v 1.5 2008/12/11 10:01:02 tnikitin Exp $
-// GEANT4 tag $Name: geant4-09-03-beta-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Class G4MultiLevelLocator implementation

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

@@ -26 +26 @@
 //
 // $Id: G4NormalNavigation.cc,v 1.9 2007/05/11 13:43:59 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //

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

@@ -26 +26 @@
 //
 // $Id: G4ParameterisedNavigation.cc,v 1.12 2007/11/09 16:06:02 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //

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 $
+// GEANT4 tag $ Name:  $
 // ---------------------------------------------------------------------------
 
@@ -69 +71 @@
     fUseSafetyForOptimisation(true),   // (false) is less sensitive to incorrect safety
     fSetFieldMgr(false),
+    fZeroStepThreshold( 0.0 ), 
     fpTrajectoryFilter( 0 )
 {
@@ -83 +86 @@
   fPreviousSafety= 0.0;
   kCarTolerance = G4GeometryTolerance::GetInstance()->GetSurfaceTolerance();
+  fZeroStepThreshold= std::max( 1.0e5 * kCarTolerance, 1.0e-1 * micrometer ) ; 
+#ifdef G4DEBUG_FIELD
+  G4cout << " PiF: Zero Step Threshold set to " << fZeroStepThreshold / millimeter
+         << " mm." << G4endl;
+  G4cout << " PiF:   Value of kCarTolerance = " << kCarTolerance / millimeter 
+         << " mm. " << G4endl;
+#endif 
 
   // Definding Intersection Locator and his parameters
@@ -92 +102 @@
     fAllocatedLocator=false;
   }
+  RefreshIntersectionLocator();  //  Copy all relevant parameters 
+}
+
+G4PropagatorInField::~G4PropagatorInField()
+{
+  if(fAllocatedLocator)delete  fIntersectionLocator; 
+}
+
+// Update the IntersectionLocator with current parameters
+void
+G4PropagatorInField::RefreshIntersectionLocator()
+{
   fIntersectionLocator->SetEpsilonStepFor(fEpsilonStep);
-  fIntersectionLocator->SetDeltaIntersectionFor(GetDeltaIntersection());
+  fIntersectionLocator->SetDeltaIntersectionFor(fCurrentFieldMgr->GetDeltaIntersection());
   fIntersectionLocator->SetChordFinderFor(GetChordFinder());
   fIntersectionLocator->SetSafetyParametersFor( fUseSafetyForOptimisation);
 }
-
-G4PropagatorInField::~G4PropagatorInField()
-{
-  if(fAllocatedLocator)delete  fIntersectionLocator; 
-}
-
 ///////////////////////////////////////////////////////////////////////////
 //
@@ -114 +130 @@
                 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)
@@ -152 +169 @@
   GetChordFinder()->SetChargeMomentumMass(fCharge, fInitialMomentumModulus, fMass); 
 
- // Values for Intersection Locator has to be updated on each call
- // because the CurrentFieldManager changes
-    fIntersectionLocator->SetChordFinderFor(GetChordFinder());
-    fIntersectionLocator->SetSafetyParametersFor( fUseSafetyForOptimisation);
-    fIntersectionLocator->SetEpsilonStepFor(fEpsilonStep);
-    fIntersectionLocator->SetDeltaIntersectionFor(GetDeltaIntersection()); 
+ // Values for Intersection Locator has to be updated on each call for the
+ // case that CurrentFieldManager has changed from the one of previous step
+  RefreshIntersectionLocator();
 
   G4FieldTrack  CurrentState(pFieldTrack);
@@ -177 +191 @@
                                            fLargestAcceptableStep ); 
   }
-  epsilon = GetDeltaOneStep() / CurrentProposedStepLength;
+  epsilon = fCurrentFieldMgr->GetDeltaOneStep() / CurrentProposedStepLength;
   // G4double raw_epsilon= epsilon;
   G4double epsilonMin= fCurrentFieldMgr->GetMinimumEpsilonStep();
@@ -200 +214 @@
     G4double decreaseFactor = 0.9; // Unused default
     if(   (fNoZeroStep < fSevereActionThreshold_NoZeroSteps)
-       && (stepTrial > 1000.0*kCarTolerance) )
+       && (stepTrial > 100.0*fZeroStepThreshold) )
     {
-      // Ensure quicker convergence
+      // Attempt quick convergence
       //
-      decreaseFactor= 0.1;
+      decreaseFactor= 0.25;
     } 
     else
@@ -212 +226 @@
       // Careful decreases to cope with tolerance are required.
       //
-      if( stepTrial > 1000.0*kCarTolerance )
-        decreaseFactor = 0.25;     // Try slow decreases
-      else if( stepTrial > 100.0*kCarTolerance )
-        decreaseFactor= 0.5;       // Try slower decreases
-      else if( stepTrial > 10.0*kCarTolerance )
+      if( stepTrial > 100.0*fZeroStepThreshold )
+        decreaseFactor = 0.35;     // Try decreasing slower
+      else if( stepTrial > 100.0*fZeroStepThreshold )
+        decreaseFactor= 0.5;       // Try yet slower decreases
+      else if( stepTrial > 10.0*fZeroStepThreshold )
         decreaseFactor= 0.75;      // Try even slower decreases
       else
@@ -224 +238 @@
 
 #ifdef G4DEBUG_FIELD
+     G4cout << MethodName << ": " 
+            << " Decreasing step -  " 
+            << " decreaseFactor= " << std::setw(8) << decreaseFactor 
+            << " stepTrial = "     << std::setw(18) << stepTrial << " "
+            << " fZeroStepThreshold = " << fZeroStepThreshold << G4endl;
      PrintStepLengthDiagnostic(CurrentProposedStepLength, decreaseFactor,
                                stepTrial, pFieldTrack);
 #endif
-     if( stepTrial == 0.0 )
+     if( stepTrial == 0.0 )  //  Change to make it < 0.1 * kCarTolerance ??
      {
        G4cout << " G4PropagatorInField::ComputeStep "
@@ -403 +422 @@
   // and only take corrective action when they occur.
   // 
-  if( TruePathLength < 0.5*kCarTolerance ) 
+  if( ( (TruePathLength < fZeroStepThreshold) 
+        && ( TruePathLength+kCarTolerance < CurrentProposedStepLength  ) 
+        ) 
+      || ( TruePathLength < 0.5*kCarTolerance )
+    )
+  {
     fNoZeroStep++;
-  else
+  }
+  else{
     fNoZeroStep = 0;
+  }
 
   if( fNoZeroStep > fAbandonThreshold_NoZeroSteps ) { 
@@ -552 +578 @@
                     const G4FieldTrack& )
 {
+#if 0
   G4cout << " PiF: NoZeroStep= " << fNoZeroStep
          << " CurrentProposedStepLength= " << CurrentProposedStepLength
          << " Full_curvelen_last=" << fFull_CurveLen_of_LastAttempt
          << " last proposed step-length= " << fLast_ProposedStepLength 
-         << " decreate factor = " << decreaseFactor
+         << " decrease factor = " << decreaseFactor
          << " step trial = " << stepTrial
          << G4endl;
+#endif
+  int  iprec= G4cout.precision(8); 
+  G4cout << " " << std::setw(12) << " PiF: NoZeroStep " 
+         << " " << std::setw(20) << " CurrentProposed len " 
+         << " " << std::setw(18) << " Full_curvelen_last" 
+         << " " << std::setw(18) << " last proposed len " 
+         << " " << std::setw(18) << " decrease factor   " 
+         << " " << std::setw(15) << " step trial  " 
+         << G4endl;
+
+  G4cout << " " << std::setw(10) << fNoZeroStep << "  "
+         << " " << std::setw(20) << CurrentProposedStepLength
+         << " " << std::setw(18) << fFull_CurveLen_of_LastAttempt
+         << " " << std::setw(18) << fLast_ProposedStepLength 
+         << " " << std::setw(18) << decreaseFactor
+         << " " << std::setw(15) << stepTrial
+         << G4endl;
+  G4cout.precision( iprec ); 
+
 }
 
@@ -617 +663 @@
   if( pCurrentPhysicalVolume)
   {
-     G4FieldManager *newFieldMgr = 0;
-     newFieldMgr= pCurrentPhysicalVolume->GetLogicalVolume()->GetFieldManager();
-     if ( newFieldMgr ) 
-        currentFieldMgr = newFieldMgr;
+     G4FieldManager *pRegionFieldMgr= 0, *localFieldMgr = 0;
+     G4LogicalVolume* pLogicalVol= pCurrentPhysicalVolume->GetLogicalVolume();
+
+     if( pLogicalVol ) { 
+        // Value for Region, if any, Overrides 
+        G4Region*  pRegion= pLogicalVol->GetRegion();
+        if( pRegion ) { 
+           pRegionFieldMgr= pRegion->GetFieldManager();
+           if( pRegionFieldMgr ) 
+             currentFieldMgr= pRegionFieldMgr;
+        }
+
+        // 'Local' Value from logical volume, if any, Overrides 
+        localFieldMgr= pLogicalVol->GetFieldManager();
+        if ( localFieldMgr ) 
+           currentFieldMgr = localFieldMgr;
+     }
   }
   fCurrentFieldMgr= currentFieldMgr;

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

@@ -26 +26 @@
 //
 // $Id: G4ReplicaNavigation.cc,v 1.19 2008/04/28 15:39:55 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //

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

@@ -25 +25 @@
 //
 // $Id: G4SimpleLocator.cc,v 1.5 2008/12/11 10:27:58 tnikitin Exp $
-// GEANT4 tag $Name: geant4-09-03-beta-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Class G4SimpleLocator implementation

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

@@ -26 +26 @@
 //
 // $Id: G4TransportationManager.cc,v 1.15 2007/04/12 11:51:48 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-02-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //

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

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: G4VIntersectionLocator.cc,v 1.5 2009/05/15 12:58:23 tnikitin Exp $
-// GEANT4 tag $Name: geant4-09-03-beta-cand-01 $
+// $Id: G4VIntersectionLocator.cc,v 1.7 2009/11/27 15:21:59 japost Exp $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Class G4VIntersectionLocator implementation
@@ -43 +43 @@
 // Constructor
 //
-G4VIntersectionLocator:: G4VIntersectionLocator(G4Navigator *theNavigator)
+G4VIntersectionLocator:: G4VIntersectionLocator(G4Navigator *theNavigator): 
+  fUseNormalCorrection(false), 
+  fiNavigator( theNavigator ),
+  fiChordFinder( 0 ),            // Not set - overridden at each step
+  fiEpsilonStep( -1.0 ),         // Out of range - overridden at each step
+  fiDeltaIntersection( -1.0 ),   // Out of range - overridden at each step
+  fiUseSafety(false)             // Default - overridden at each step
 {
   kCarTolerance = G4GeometryTolerance::GetInstance()->GetSurfaceTolerance();
-  fiNavigator = theNavigator;
   fVerboseLevel = 0;
-  fUseNormalCorrection = false;
   fHelpingNavigator = new G4Navigator();
 }      
@@ -191 +195 @@
      if (std::abs(advanceLength)<kCarTolerance)
      {
-       advanceLength=(EstimatedEndStateB.GetPosition()
-                     -newEndPoint.GetPosition()).mag();
+       goodAdvance=true;
      }
+     else{
      goodAdvance= 
        integrDriver->AccurateAdvance(newEndPoint, advanceLength,
                                      GetEpsilonStepFor());
+     }
   }
   while( !goodAdvance && (++itrial < no_trials) );

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

@@ -26 +26 @@
 //
 // $Id: G4VoxelNavigation.cc,v 1.9 2008/11/14 18:26:35 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //