Changeset 921 for trunk/source/geometry/magneticfield/include/G4ChordFinder.hh

Timestamp:

Feb 16, 2009, 10:14:30 AM (16 years ago)

Author:

garnier

Message:

en test de gl2ps. Problemes de libraries

File:

• trunk/source/geometry/magneticfield/include/G4ChordFinder.hh (modified) (7 diffs)

trunk/source/geometry/magneticfield/include/G4ChordFinder.hh

@@ -25 +25 @@
 //
 //
-// $Id: G4ChordFinder.hh,v 1.19 2008/07/15 14:02:06 japost Exp $
-// GEANT4 tag $Name: HEAD $
+// $Id: G4ChordFinder.hh,v 1.21 2008/10/29 14:17:42 gcosmo Exp $
+// GEANT4 tag $Name: geant4-09-02-cand-01 $
 //
 // 
-// class G4ChordFinder
-//
-// Class description:
+// Class G4ChordFinder
+//
+// class description:
 //
 // A class that provides RK integration of motion ODE  (as does g4magtr)
@@ -38 +38 @@
 
 // History:
-// - 25.02.97 John Apostolakis,  design and implementation 
-// - 05.03.97 V. Grichine , makeup to G4 'standard'
+// - 25.02.97 - John Apostolakis - Design and implementation 
 // -------------------------------------------------------------------
 
@@ -62 +61 @@
       
       virtual ~G4ChordFinder();
-
 
       G4double    AdvanceChordLimited( G4FieldTrack& yCurrent,
@@ -73 +71 @@
         // -> Returns Length of Step taken.
      
-      G4FieldTrack ApproxCurvePointS(const  G4FieldTrack&  curveAPointVelocity,
-                                      const  G4FieldTrack&  curveBPointVelocity,
-                                      const  G4ThreeVector& currentEPoint,
-                                      const  G4ThreeVector& currentFPoint,
-                                      const  G4ThreeVector& PointG,
-                                             G4bool first,G4double      epsStep);
+      G4FieldTrack ApproxCurvePointS( const G4FieldTrack&  curveAPointVelocity,
+                                      const G4FieldTrack&  curveBPointVelocity,
+                                      const G4FieldTrack&  ApproxCurveV,
+                                      const G4ThreeVector& currentEPoint,
+                                      const G4ThreeVector& currentFPoint,
+                                      const G4ThreeVector& PointG,
+                                            G4bool first,  G4double epsStep);
  
-      G4FieldTrack ApproxCurvePointV(const  G4FieldTrack&  curveAPointVelocity,
-                                     const  G4FieldTrack&  curveBPointVelocity,
-                                     const  G4ThreeVector& currentEPoint,
-                                            G4double      epsStep);
+      G4FieldTrack ApproxCurvePointV( const G4FieldTrack&  curveAPointVelocity,
+                                      const G4FieldTrack&  curveBPointVelocity,
+                                      const G4ThreeVector& currentEPoint,
+                                            G4double       epsStep);
 
       inline G4double InvParabolic( const G4double xa, const G4double ya,
-                                    const G4double xb, const G4double yb,
-                             const G4double xc, const G4double yc );
+                                    const G4double xb, const G4double yb,
+                                    const G4double xc, const G4double yc );
 
       inline G4double  GetDeltaChord() const;
@@ -112 +111 @@
         // A report with the above -- and possibly other stats
       inline G4int SetVerbose( G4int newvalue=1); 
-       // Set verbosity and return old value
+        // Set verbosity and return old value
+
+      void SetFractions_Last_Next( G4double fractLast= 0.90, 
+                                   G4double fractNext= 0.95 ); 
+        // Parameters for  performance ... change with great care
+
+      inline void SetFirstFraction(G4double fractFirst);
+        // Parameter for  performance ... change with great care
+
+   public:  // without description
+
+      void     TestChordPrint( G4int    noTrials, 
+                               G4int    lastStepTrial, 
+                               G4double dChordStep, 
+                               G4double nextStepTrial );
+
+        //   Printing for monitoring ...
+ 
+      inline   G4double GetFirstFraction();         // Originally 0.999
+      inline   G4double GetFractionLast();          // Originally 1.000
+      inline   G4double GetFractionNextEstimate();  // Originally 0.980
+      inline   G4double GetMultipleRadius();        // No original value
+        //  Parameters for adapting performance ... use with great care
 
    protected:   // .........................................................
@@ -140 +161 @@
                                 G4double  oldStepTrial, 
                                 G4double  dChordStep);
-  public:  // no description 
-      void     TestChordPrint( G4int    noTrials, 
-                               G4int    lastStepTrial, 
-                               G4double dChordStep, 
-                               G4double nextStepTrial );
-        //   Printing for monitoring ...
- 
-      inline   G4double GetFirstFraction();         // Originally 0.999
-      inline   G4double GetFractionLast();          // Originally 1.000
-      inline   G4double GetFractionNextEstimate();  // Originally 0.980
-      inline   G4double GetMultipleRadius();        // No original value
-       //  Parameters for adapting performance ... use with great care
-
-   public:  // with description 
-      void     SetFractions_Last_Next( G4double fractLast= 0.90, 
-                                       G4double fractNext= 0.95 ); 
-      //  Parameters for  performance ... change with great care
-
-      inline   void     SetFirstFraction(G4double fractFirst);
-      //  Parameter for  performance ... change with great care
-
-   protected:
+
       inline G4double GetLastStepEstimateUnc(); 
       inline void     SetLastStepEstimateUnc( G4double stepEst ); 
@@ -172 +172 @@
 
    private:  // ............................................................
-                                            // G4int    nOK, nBAD;
+                                          // G4int    nOK, nBAD;
       G4MagInt_Driver* fIntgrDriver;
 
       const G4double fDefaultDeltaChord;  // SET in G4ChordFinder.cc = 0.25 mm
 
-      G4double fDeltaChord;                        //  Maximum miss distance 
-
-      G4double    fLastStepEstimate_Unconstrained; //  State information for efficiency
+      G4double fDeltaChord;               //  Maximum miss distance 
+
+      G4double    fLastStepEstimate_Unconstrained;
+        //  State information for efficiency
+
       //  Variables used in construction/destruction
+
       G4bool fAllocatedStepper;
       G4EquationOfMotion* fEquation;