Changeset 1231 for trunk/source/geometry/magneticfield/test/NTST

Timestamp:

Jan 11, 2010, 3:22:34 PM (16 years ago)

Author:

garnier

Message:

update from CVS

File:

• trunk/source/geometry/magneticfield/test/NTST/src/NTSTDetectorConstruction.cc (modified) (2 diffs)

trunk/source/geometry/magneticfield/test/NTST/src/NTSTDetectorConstruction.cc

@@ -53 +53 @@
 #include "G4RKG3_Stepper.hh"
 #include "G4HelixMixedStepper.hh"
+#include "G4NystromRK4.hh"
 
 #include "G4DELPHIMagField.hh"
@@ -210 +211 @@
   pEquation = new G4Mag_UsualEqRhs( &field); 
  
-  // pStepper = 
-  //           new G4ClassicalRK4( pEquation ); 
-  //           new G4RKG3_Stepper( fEquation );  // Nystrom, like Geant3 
-  // pStepper= new G4SimpleRunge( pEquation );
-  // pStepper= new G4CashKarpRKF45( pEquation );
-  pStepper= new G4HelixMixedStepper( pEquation );
+  // pStepper =   
+  //           new G4ClassicalRK4( pEquation ); G4cout << "Stepper is " << "ClassicalRK4" << G4endl;
+  //           new G4RKG3_Stepper( pEquation );  // Nystrom, like Geant3 
+  // pStepper= new G4SimpleRunge( pEquation ); G4cout << "Stepper is " << "CashKarpRKF45" << G4endl;
+  // pStepper= new G4CashKarpRKF45( pEquation ); G4cout << "Stepper is " << "CashKarpRKF45" << G4endl;
+  // pStepper= new G4HelixMixedStepper( pEquation ); G4cout << "Stepper is " << "HelixMixed" << G4endl;
   // pStepper=  StepperFactory::CreateStepper( order ); 
 
-  G4cout << "Stepper is " 
-    //   << "CashKarpRKF45" << G4endl;
+  pStepper= new G4NystromRK4( pEquation ); G4cout << "Stepper is " << "NystromRK4" << G4endl;
+
+    // G4cout << "Stepper is " << "CashKarpRKF45" << G4endl;
     //   << "ClassicalRK4" << G4endl;
-         << " G4HelixMixedStepper " << G4endl;
+    //   << " G4HelixMixedStepper " << G4endl;
 
   // globalFieldManager->CreateChordFinder( (G4MagneticField *)&field );