Import Geant4 4.0.0 source tree

2016-06-08 16:18:25 +02:00
parent 36c080dca6
commit 921d3b1cda
3990 changed files with 185376 additions and 82884 deletions
@@ -21,11 +21,11 @@
 // ********************************************************************
 //
 //
-// $Id: ExN02ChamberParameterisation.cc,v 1.4.2.1 2001/06/28 19:07:30 gunter Exp $
-// GEANT4 tag $Name:  $
+// $Id: ExN02ChamberParameterisation.cc,v 1.6 2001/10/11 12:32:36 maire Exp $
+// GEANT4 tag $Name: geant4-04-00 $
 //
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

 #include "ExN02ChamberParameterisation.hh"

@@ -33,7 +33,7 @@
 #include "G4ThreeVector.hh"
 #include "G4Box.hh"

-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

 ExN02ChamberParameterisation::ExN02ChamberParameterisation(  
        G4int    NoChambers, 
@@ -51,20 +51,19 @@ ExN02ChamberParameterisation::ExN02ChamberParameterisation(
   // fHalfLengthLast = lengthFinal;
   if( NoChambers > 0 ){
      fHalfLengthIncr =  0.5 * (lengthFinal-lengthInitial)/NoChambers;
-
-      if( spacingZ < widthChamber ) {
-         G4Exception( "ExN02ChamberParameterisation construction: Width > Spacing" );
+      if (spacingZ < widthChamber) {
+       G4Exception("ExN02ChamberParameterisation construction: Width>Spacing");
      }
   }
   
 }

-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

 ExN02ChamberParameterisation::~ExN02ChamberParameterisation()
 {}

-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

 void ExN02ChamberParameterisation::ComputeTransformation
 (const G4int copyNo, G4VPhysicalVolume* physVol) const
@@ -75,7 +74,7 @@ void ExN02ChamberParameterisation::ComputeTransformation
  physVol->SetRotation(0);
 }

-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

 void ExN02ChamberParameterisation::ComputeDimensions
 (G4Box& trackerChamber, const G4int copyNo,
@@ -87,4 +86,4 @@ void ExN02ChamberParameterisation::ComputeDimensions
  trackerChamber.SetZHalfLength(fHalfWidth);
 }

-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
@@ -21,11 +21,11 @@
 // ********************************************************************
 //
 //
-// $Id: ExN02DetectorConstruction.cc,v 1.6.2.1 2001/06/28 19:07:30 gunter Exp $
-// GEANT4 tag $Name:  $
+// $Id: ExN02DetectorConstruction.cc,v 1.10 2001/11/05 08:24:50 gcosmo Exp $
+// GEANT4 tag $Name: geant4-04-00 $
 //
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo..... 
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... 
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 
 #include "ExN02DetectorConstruction.hh"
 #include "ExN02DetectorMessenger.hh"
@@ -40,21 +40,21 @@
 #include "G4PVParameterised.hh"
 #include "G4SDManager.hh"

-///#include "G4UserLimits.hh"
+#include "G4UserLimits.hh"

 #include "G4VisAttributes.hh"
 #include "G4Colour.hh"

 #include "G4ios.hh"

-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 
 ExN02DetectorConstruction::ExN02DetectorConstruction()
-:solidWorld(NULL),  logicWorld(NULL),  physiWorld(NULL),
- solidTarget(NULL), logicTarget(NULL), physiTarget(NULL), 
- solidTracker(NULL),logicTracker(NULL),physiTracker(NULL), 
- solidChamber(NULL),logicChamber(NULL),physiChamber(NULL), 
- TargetMater(NULL), ChamberMater(NULL),fpMagField(NULL),
+:solidWorld(0),  logicWorld(0),  physiWorld(0),
+ solidTarget(0), logicTarget(0), physiTarget(0), 
+ solidTracker(0),logicTracker(0),physiTracker(0), 
+ solidChamber(0),logicChamber(0),physiChamber(0), 
+ TargetMater(0), ChamberMater(0),fpMagField(0),
 fWorldLength(0.),  fTargetLength(0.), fTrackerLength(0.),
 NbOfChambers(0) ,  ChamberWidth(0.),  ChamberSpacing(0.)
 {
@@ -62,15 +62,15 @@ ExN02DetectorConstruction::ExN02DetectorConstruction()
  detectorMessenger = new ExN02DetectorMessenger(this);
 }

-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 
 ExN02DetectorConstruction::~ExN02DetectorConstruction()
-{ 
+{
  delete fpMagField;
  delete detectorMessenger;             
 }

-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 
 G4VPhysicalVolume* ExN02DetectorConstruction::Construct()
 {
@@ -91,11 +91,6 @@ G4VPhysicalVolume* ExN02DetectorConstruction::Construct()
    Air->AddElement(elN, .7);
    Air->AddElement(elO, .3);

-  //Al
-    a = 26.98*g/mole;
-    density = 2.7*g/cm3;
-    G4Material* Aluminium = new G4Material(name="Al", z=13., a, density);
-
  //Pb
    a = 207.19*g/mole;
    density = 11.35*g/cm3;
@@ -119,8 +114,8 @@ G4VPhysicalVolume* ExN02DetectorConstruction::Construct()
  ChamberWidth = 20*cm;
  ChamberSpacing = 80*cm;
  
-  fTrackerLength = (NbOfChambers+1)*ChamberSpacing; // Full length of the Tracker
-  fTargetLength  = 5.0 * cm;                        // Full length of the Target
+  fTrackerLength = (NbOfChambers+1)*ChamberSpacing; // Full length of Tracker
+  fTargetLength  = 5.0 * cm;                        // Full length of Target
  
  TargetMater  = Pb;
  ChamberMater = Xenon;
@@ -138,14 +133,14 @@ G4VPhysicalVolume* ExN02DetectorConstruction::Construct()

  G4double HalfWorldLength = 0.5*fWorldLength;
  
-  solidWorld= new G4Box("World",HalfWorldLength,HalfWorldLength,HalfWorldLength);
-  logicWorld= new G4LogicalVolume( solidWorld, Air, "World", 0, 0, 0);
+ solidWorld= new G4Box("world",HalfWorldLength,HalfWorldLength,HalfWorldLength);
+ logicWorld= new G4LogicalVolume( solidWorld, Air, "World", 0, 0, 0);
  
  //  Must place the World Physical volume unrotated at (0,0,0).
  // 
  physiWorld = new G4PVPlacement(0,               // no rotation
                                 G4ThreeVector(), // at (0,0,0)
-				 "WorldPV",       // its name
+				 "World",         // its name
                                 logicWorld,      // its logical volume
                                 0,               // its mother  volume
                                 false,           // no boolean operations
@@ -157,11 +152,11 @@ G4VPhysicalVolume* ExN02DetectorConstruction::Construct()
  
  G4ThreeVector positionTarget = G4ThreeVector(0,0,-(targetSize+trackerSize));
   
-  solidTarget = new G4Box("TargetSolid",targetSize,targetSize,targetSize);
-  logicTarget = new G4LogicalVolume(solidTarget,TargetMater,"TargetLV",0,0,0);
+  solidTarget = new G4Box("target",targetSize,targetSize,targetSize);
+  logicTarget = new G4LogicalVolume(solidTarget,TargetMater,"Target",0,0,0);
  physiTarget = new G4PVPlacement(0,               // no rotation
 				  positionTarget,  // at (x,y,z)
-				  "TargetPV",      // its name
+				  "Target",        // its name
 				  logicTarget,     // its logical volume
 				  physiWorld,      // its mother  volume
 				  false,           // no boolean operations
@@ -176,7 +171,7 @@ G4VPhysicalVolume* ExN02DetectorConstruction::Construct()
  
  G4ThreeVector positionTracker = G4ThreeVector(0,0,0);
  
-  solidTracker = new G4Box("Tracker",trackerSize,trackerSize,trackerSize);
+  solidTracker = new G4Box("tracker",trackerSize,trackerSize,trackerSize);
  logicTracker = new G4LogicalVolume(solidTracker , Air, "Tracker",0,0,0);  
  physiTracker = new G4PVPlacement(0,              // no rotation
 				  positionTracker, // at (x,y,z)
@@ -246,19 +241,19 @@ G4VPhysicalVolume* ExN02DetectorConstruction::Construct()
  
 //--------- example of User Limits -------------------------------

-  //below is an example of how to set tracking constraints in a given
-  //logical volume(see also in N02PhysicsList how to setup the process
-  //G4UserSpecialCuts).  
-  //set a max Step length in the tracker region
-  ///G4double maxStep = 0.5*ChamberWidth, maxLength = 2*fTrackerLength;
-  ///G4double maxTime = 0.1*ns, minEkin = 10*MeV;
-  ///logicTracker->SetUserLimits(new G4UserLimits(maxStep,maxLength,maxTime,
-  ///                                              minEkin));
+  // below is an example of how to set tracking constraints in a given
+  // logical volume(see also in N02PhysicsList how to setup the process
+  // G4UserSpecialCuts).  
+  // Sets a max Step length in the tracker region
+  // G4double maxStep = 0.5*ChamberWidth, maxLength = 2*fTrackerLength;
+  // G4double maxTime = 0.1*ns, minEkin = 10*MeV;
+  // logicTracker->SetUserLimits(new G4UserLimits(maxStep,maxLength,maxTime,
+  //                                               minEkin));
  
  return physiWorld;
 }

-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 
 void ExN02DetectorConstruction::setTargetMaterial(G4String materialName)
 {
@@ -272,7 +267,7 @@ void ExN02DetectorConstruction::setTargetMaterial(G4String materialName)
     }             
 }
 
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

 void ExN02DetectorConstruction::setChamberMaterial(G4String materialName)
 {
@@ -286,11 +281,11 @@ void ExN02DetectorConstruction::setChamberMaterial(G4String materialName)
     }             
 }
 
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo..... 
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 
 void ExN02DetectorConstruction::SetMagField(G4double fieldValue)
 {
  fpMagField->SetFieldValue(fieldValue);
 }

-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo..... 
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
@@ -21,11 +21,11 @@
 // ********************************************************************
 //
 //
-// $Id: ExN02DetectorMessenger.cc,v 1.3.4.1 2001/06/28 19:07:30 gunter Exp $
-// GEANT4 tag $Name:  $
+// $Id: ExN02DetectorMessenger.cc,v 1.6 2001/10/11 12:32:37 maire Exp $
+// GEANT4 tag $Name: geant4-04-00 $
 // 
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

 #include "ExN02DetectorMessenger.hh"

@@ -35,9 +35,9 @@
 #include "G4UIcmdWithADoubleAndUnit.hh"
 #include "globals.hh"

-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

-ExN02DetectorMessenger::ExN02DetectorMessenger(ExN02DetectorConstruction * myDet)
+ExN02DetectorMessenger::ExN02DetectorMessenger(ExN02DetectorConstruction* myDet)
 :myDetector(myDet)
 { 

@@ -56,14 +56,14 @@ ExN02DetectorMessenger::ExN02DetectorMessenger(ExN02DetectorConstruction * myDet
  
  FieldCmd = new G4UIcmdWithADoubleAndUnit("/mydet/setField",this);  
  FieldCmd->SetGuidance("Define magnetic field.");
-  FieldCmd->SetGuidance("Magnetic field will be in Z direction.");
-  FieldCmd->SetParameterName("Bz",false);
+  FieldCmd->SetGuidance("Magnetic field will be in X direction.");
+  FieldCmd->SetParameterName("Bx",false);
  FieldCmd->SetDefaultUnit("tesla");
  FieldCmd->SetUnitCategory("Magnetic flux density");
  FieldCmd->AvailableForStates(PreInit,Idle);  
 }

-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

 ExN02DetectorMessenger::~ExN02DetectorMessenger()
 {
@@ -73,18 +73,18 @@ ExN02DetectorMessenger::~ExN02DetectorMessenger()
  delete mydetDir;
 }

-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

-void ExN02DetectorMessenger::SetNewValue(G4UIcommand * command,G4String newValues)
+void ExN02DetectorMessenger::SetNewValue(G4UIcommand* command,G4String newValue)
 { 
  if( command == TargMatCmd )
-   { myDetector->setTargetMaterial(newValues);}
+   { myDetector->setTargetMaterial(newValue);}
   
  if( command == ChamMatCmd )
-   { myDetector->setChamberMaterial(newValues);}  
+   { myDetector->setChamberMaterial(newValue);}  
  
  if( command == FieldCmd )
-   { myDetector->SetMagField(FieldCmd->GetNewDoubleValue(newValues));}
+   { myDetector->SetMagField(FieldCmd->GetNewDoubleValue(newValue));}
 }

-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
@@ -21,11 +21,11 @@
 // ********************************************************************
 //
 //
-// $Id: ExN02EventAction.cc,v 1.5.4.1 2001/06/28 19:07:30 gunter Exp $
-// GEANT4 tag $Name:  $
+// $Id: ExN02EventAction.cc,v 1.7 2001/10/11 12:32:37 maire Exp $
+// GEANT4 tag $Name: geant4-04-00 $
 //
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo..... 
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 
 #include "ExN02EventAction.hh"

@@ -33,40 +33,54 @@
 #include "G4EventManager.hh"
 #include "G4TrajectoryContainer.hh"
 #include "G4Trajectory.hh"
+#include "G4VVisManager.hh"
 #include "G4ios.hh"

-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 
 ExN02EventAction::ExN02EventAction()
 {}

-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 
 ExN02EventAction::~ExN02EventAction()
 {}

-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 
 void ExN02EventAction::BeginOfEventAction(const G4Event*)
 {}

-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 
 void ExN02EventAction::EndOfEventAction(const G4Event* evt)
 {
  G4int event_id = evt->GetEventID();
-
-  G4TrajectoryContainer * trajectoryContainer = evt->GetTrajectoryContainer();
+  
+  // get number of stored trajectories
+  //
+  G4TrajectoryContainer* trajectoryContainer = evt->GetTrajectoryContainer();
  G4int n_trajectories = 0;
  if (trajectoryContainer) n_trajectories = trajectoryContainer->entries();
-
-  if (event_id < 100 || event_id%100 == 0) {
-
-    G4cout << ">>> Event " << evt->GetEventID() << G4endl;
  
+  // periodic printing
+  //
+  if (event_id < 100 || event_id%100 == 0) {
+    G4cout << ">>> Event " << evt->GetEventID() << G4endl;
    G4cout << "    " << n_trajectories 
 	   << " trajectories stored in this event." << G4endl;
  }
+    
+  // extract the trajectories and draw them
+  //
+  if (G4VVisManager::GetConcreteInstance())
+    {
+     for (G4int i=0; i<n_trajectories; i++) 
+        { G4Trajectory* trj = (G4Trajectory*)
+	                            ((*(evt->GetTrajectoryContainer()))[i]);
+          trj->DrawTrajectory(50);
+        }
+    }
 }

-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo..... 
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
@@ -21,18 +21,18 @@
 // ********************************************************************
 //
 //
-// $Id: ExN02MagneticField.cc,v 1.4.4.1 2001/06/28 19:07:30 gunter Exp $
-// GEANT4 tag $Name:  $
+// $Id: ExN02MagneticField.cc,v 1.6 2001/10/11 12:32:37 maire Exp $
+// GEANT4 tag $Name: geant4-04-00 $
 //  
 //   User Field class implementation.
 //
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

 #include "ExN02MagneticField.hh"
 #include "G4FieldManager.hh"

-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

 ExN02MagneticField::ExN02MagneticField()
  : G4UniformMagField(G4ThreeVector())
@@ -41,7 +41,7 @@ ExN02MagneticField::ExN02MagneticField()
  GetGlobalFieldManager()->CreateChordFinder(this);
 }

-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

 ExN02MagneticField::ExN02MagneticField(G4ThreeVector fieldVector)
  : G4UniformMagField(fieldVector)
@@ -50,7 +50,7 @@ ExN02MagneticField::ExN02MagneticField(G4ThreeVector fieldVector)
  GetGlobalFieldManager()->CreateChordFinder(this);
 }

-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

 // Set the value of the Global Field to fieldValue along X
 //
@@ -59,7 +59,7 @@ void ExN02MagneticField::SetFieldValue(G4double fieldValue)
   G4UniformMagField::SetFieldValue(G4ThreeVector(fieldValue,0,0));
 }

-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

 // Set the value of the Global Field
 //
@@ -80,14 +80,14 @@ void ExN02MagneticField::SetFieldValue(G4ThreeVector fieldVector)
  }
 }

-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

 ExN02MagneticField::~ExN02MagneticField()
 {
  // GetGlobalFieldManager()->SetDetectorField(0);
 }

-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

 #include "G4TransportationManager.hh"

@@ -95,4 +95,5 @@ G4FieldManager*  ExN02MagneticField::GetGlobalFieldManager()
 {
  return G4TransportationManager::GetTransportationManager()->GetFieldManager();
 }
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....    
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
@@ -21,11 +21,11 @@
 // ********************************************************************
 //
 //
-// $Id: ExN02PhysicsList.cc,v 1.9.2.1 2001/06/28 19:07:30 gunter Exp $
-// GEANT4 tag $Name:  $
+// $Id: ExN02PhysicsList.cc,v 1.12 2001/10/11 12:32:37 maire Exp $
+// GEANT4 tag $Name: geant4-04-00 $
 //
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

 #include "globals.hh"
 #include "ExN02PhysicsList.hh"
@@ -40,7 +40,7 @@
 #include "G4ios.hh"
 #include "g4std/iomanip"                

-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

 ExN02PhysicsList::ExN02PhysicsList():  G4VUserPhysicsList()
 {
@@ -48,12 +48,12 @@ ExN02PhysicsList::ExN02PhysicsList():  G4VUserPhysicsList()
   SetVerboseLevel(1);
 }

-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

 ExN02PhysicsList::~ExN02PhysicsList()
 {}

-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

 void ExN02PhysicsList::ConstructParticle()
 {
@@ -69,7 +69,7 @@ void ExN02PhysicsList::ConstructParticle()

 }

-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

 void ExN02PhysicsList::ConstructBosons()
 {
@@ -81,7 +81,7 @@ void ExN02PhysicsList::ConstructBosons()
  G4Gamma::GammaDefinition();
 }

-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

 void ExN02PhysicsList::ConstructLeptons()
 {
@@ -100,7 +100,7 @@ void ExN02PhysicsList::ConstructLeptons()
  G4AntiNeutrinoMu::AntiNeutrinoMuDefinition();
 }

-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

 void ExN02PhysicsList::ConstructMesons()
 {
@@ -119,7 +119,7 @@ void ExN02PhysicsList::ConstructMesons()
  G4KaonZeroShort::KaonZeroShortDefinition();
 }

-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

 void ExN02PhysicsList::ConstructBaryons()
 {
@@ -131,7 +131,7 @@ void ExN02PhysicsList::ConstructBaryons()
  G4AntiNeutron::AntiNeutronDefinition();
 }

-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

 void ExN02PhysicsList::ConstructProcess()
 {
@@ -140,7 +140,7 @@ void ExN02PhysicsList::ConstructProcess()
  ConstructGeneral();
 }

-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

 #include "G4ComptonScattering.hh"
 #include "G4GammaConversion.hh"
@@ -158,9 +158,9 @@ void ExN02PhysicsList::ConstructProcess()

 #include "G4hIonisation.hh"

-////#include "G4UserSpecialCuts.hh"
+#include "G4UserSpecialCuts.hh"

-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

 void ExN02PhysicsList::ConstructEM()
 {
@@ -274,7 +274,7 @@ void ExN02PhysicsList::ConstructEM()
  }
 }

-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

 #include "G4Decay.hh"
 void ExN02PhysicsList::ConstructGeneral()
@@ -294,7 +294,7 @@ void ExN02PhysicsList::ConstructGeneral()
  }
 }

-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

 void ExN02PhysicsList::SetCuts()
 {
@@ -306,5 +306,5 @@ void ExN02PhysicsList::SetCuts()
  if (verboseLevel>0) DumpCutValuesTable();
 }

-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

@@ -21,11 +21,11 @@
 // ********************************************************************
 //
 //
-// $Id: ExN02PrimaryGeneratorAction.cc,v 1.3.4.1 2001/06/28 19:07:31 gunter Exp $
-// GEANT4 tag $Name:  $
+// $Id: ExN02PrimaryGeneratorAction.cc,v 1.5 2001/10/11 12:32:37 maire Exp $
+// GEANT4 tag $Name: geant4-04-00 $
 //
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

 #include "ExN02PrimaryGeneratorAction.hh"
 #include "ExN02DetectorConstruction.hh"
@@ -36,9 +36,10 @@
 #include "G4ParticleDefinition.hh"
 #include "globals.hh"

-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

-ExN02PrimaryGeneratorAction::ExN02PrimaryGeneratorAction(ExN02DetectorConstruction* myDC)
+ExN02PrimaryGeneratorAction::ExN02PrimaryGeneratorAction(
+                                               ExN02DetectorConstruction* myDC)
 :myDetector(myDC)
 {
  G4int n_particle = 1;
@@ -54,14 +55,14 @@ ExN02PrimaryGeneratorAction::ExN02PrimaryGeneratorAction(ExN02DetectorConstructi
  particleGun->SetParticleEnergy(3.0*GeV);
 }

-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

 ExN02PrimaryGeneratorAction::~ExN02PrimaryGeneratorAction()
 {
  delete particleGun;
 }

-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

 void ExN02PrimaryGeneratorAction::GeneratePrimaries(G4Event* anEvent)
 { 
@@ -71,5 +72,5 @@ void ExN02PrimaryGeneratorAction::GeneratePrimaries(G4Event* anEvent)
  particleGun->GeneratePrimaryVertex(anEvent);
 }

-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

@@ -21,11 +21,11 @@
 // ********************************************************************
 //
 //
-// $Id: ExN02RunAction.cc,v 1.4.4.1 2001/06/28 19:07:31 gunter Exp $
-// GEANT4 tag $Name:  $
+// $Id: ExN02RunAction.cc,v 1.6 2001/10/11 12:32:37 maire Exp $
+// GEANT4 tag $Name: geant4-04-00 $
 // 
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

 #include "ExN02RunAction.hh"

@@ -34,17 +34,17 @@
 #include "G4VVisManager.hh"
 #include "G4ios.hh"

-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

 ExN02RunAction::ExN02RunAction()
 {}

-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

 ExN02RunAction::~ExN02RunAction()
 {}

-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

 void ExN02RunAction::BeginOfRunAction(const G4Run* aRun)
 {
@@ -57,19 +57,17 @@ void ExN02RunAction::BeginOfRunAction(const G4Run* aRun)
    } 
 }

-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

 void ExN02RunAction::EndOfRunAction(const G4Run*)
 {
-  G4VVisManager* pVVisManager = G4VVisManager::GetConcreteInstance();
-  
-  if(G4VVisManager::GetConcreteInstance())
-  {
-    G4UImanager::GetUIpointer()->ApplyCommand("/vis/viewer/update");
-  }
+  if (G4VVisManager::GetConcreteInstance())
+    {
+     G4UImanager::GetUIpointer()->ApplyCommand("/vis/viewer/update");
+    }
 }

-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......



@@ -21,27 +21,25 @@
 // ********************************************************************
 //
 //
-// $Id: ExN02SteppingAction.cc,v 1.4.4.1 2001/06/28 19:07:31 gunter Exp $
-// GEANT4 tag $Name:  $
+// $Id: ExN02SteppingAction.cc,v 1.7 2001/11/05 08:24:50 gcosmo Exp $
+// GEANT4 tag $Name: geant4-04-00 $
 // 
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

 #include "ExN02SteppingAction.hh"
 #include "G4SteppingManager.hh"

-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

 ExN02SteppingAction::ExN02SteppingAction()
 { }

-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

-void ExN02SteppingAction::UserSteppingAction(const G4Step* aStep)
+void ExN02SteppingAction::UserSteppingAction(const G4Step*)
 { 
-  const G4VPhysicalVolume* currentVolume =
-                           aStep->GetPreStepPoint()->GetPhysicalVolume();
 }

-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

@@ -21,28 +21,28 @@
 // ********************************************************************
 //
 //
-// $Id: ExN02SteppingVerbose.cc,v 1.6.2.1 2001/06/28 19:07:31 gunter Exp $
-// GEANT4 tag $Name:  $
+// $Id: ExN02SteppingVerbose.cc,v 1.8 2001/10/11 12:32:38 maire Exp $
+// GEANT4 tag $Name: geant4-04-00 $
 //
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

 #include "ExN02SteppingVerbose.hh"

 #include "G4SteppingManager.hh"
 #include "G4UnitsTable.hh"

-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

 ExN02SteppingVerbose::ExN02SteppingVerbose()
 {}

-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

 ExN02SteppingVerbose::~ExN02SteppingVerbose()
 {}
 
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

 void ExN02SteppingVerbose::StepInfo()
 {
@@ -66,14 +66,14 @@ void ExN02SteppingVerbose::StepInfo()
 	     << G4std::setw(10) << "Process"   << G4endl;	          
    }

-    G4cout << G4std::setw( 5) << fTrack->GetCurrentStepNumber() << " "
-	   << G4std::setw( 6) << G4BestUnit(fTrack->GetPosition().x(),"Length")
-	   << G4std::setw( 6) << G4BestUnit(fTrack->GetPosition().y(),"Length")
-	   << G4std::setw( 6) << G4BestUnit(fTrack->GetPosition().z(),"Length")
-	   << G4std::setw( 6) << G4BestUnit(fTrack->GetKineticEnergy(),"Energy")
-	   << G4std::setw( 6) << G4BestUnit(fStep->GetTotalEnergyDeposit(),"Energy")
-	   << G4std::setw( 6) << G4BestUnit(fStep->GetStepLength(),"Length")
-	   << G4std::setw( 6) << G4BestUnit(fTrack->GetTrackLength(),"Length");
+    G4cout << G4std::setw(5) << fTrack->GetCurrentStepNumber() << " "
+	<< G4std::setw(6) << G4BestUnit(fTrack->GetPosition().x(),"Length")
+	<< G4std::setw(6) << G4BestUnit(fTrack->GetPosition().y(),"Length")
+	<< G4std::setw(6) << G4BestUnit(fTrack->GetPosition().z(),"Length")
+	<< G4std::setw(6) << G4BestUnit(fTrack->GetKineticEnergy(),"Energy")
+	<< G4std::setw(6) << G4BestUnit(fStep->GetTotalEnergyDeposit(),"Energy")
+	<< G4std::setw(6) << G4BestUnit(fStep->GetStepLength(),"Length")
+	<< G4std::setw(6) << G4BestUnit(fTrack->GetTrackLength(),"Length");

    // if( fStepStatus != fWorldBoundary){ 
    if( fTrack->GetNextVolume() != 0 ) { 
@@ -84,7 +84,7 @@ void ExN02SteppingVerbose::StepInfo()

    if(fStep->GetPostStepPoint()->GetProcessDefinedStep() != NULL){
      G4cout << "  " 
-             << G4std::setw(10) << fStep->GetPostStepPoint()->GetProcessDefinedStep()
+        << G4std::setw(10) << fStep->GetPostStepPoint()->GetProcessDefinedStep()
 	                                ->GetProcessName();
    } else {
      G4cout << "   UserLimit";
@@ -107,7 +107,7 @@ void ExN02SteppingVerbose::StepInfo()
 	       << " ---------------"
 	       << G4endl;

-	for(G4int lp1=(*fSecondary).size()-tN2ndariesTot; 
+	for(size_t lp1=(*fSecondary).size()-tN2ndariesTot; 
                        lp1<(*fSecondary).size(); lp1++){
 	  G4cout << "    : "
 		 << G4std::setw(6)
@@ -134,7 +134,7 @@ void ExN02SteppingVerbose::StepInfo()
  G4cout.precision(prec);
 }

-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

 void ExN02SteppingVerbose::TrackingStarted()
 {
@@ -154,14 +154,14 @@ G4int prec = G4cout.precision(3);
 	   << G4std::setw(10) << "Volume"     << "  "
 	   << G4std::setw(10) << "Process"    << G4endl;	     

-    G4cout << G4std::setw( 5) << fTrack->GetCurrentStepNumber() << " "
-	   << G4std::setw( 6) << G4BestUnit(fTrack->GetPosition().x(),"Length")
-	   << G4std::setw( 6) << G4BestUnit(fTrack->GetPosition().y(),"Length")
-	   << G4std::setw( 6) << G4BestUnit(fTrack->GetPosition().z(),"Length")
-	   << G4std::setw( 6) << G4BestUnit(fTrack->GetKineticEnergy(),"Energy")
-	   << G4std::setw( 6) << G4BestUnit(fStep->GetTotalEnergyDeposit(),"Energy")
-	   << G4std::setw( 6) << G4BestUnit(fStep->GetStepLength(),"Length")
-	   << G4std::setw( 6) << G4BestUnit(fTrack->GetTrackLength(),"Length");
+    G4cout << G4std::setw(5) << fTrack->GetCurrentStepNumber() << " "
+	<< G4std::setw(6) << G4BestUnit(fTrack->GetPosition().x(),"Length")
+	<< G4std::setw(6) << G4BestUnit(fTrack->GetPosition().y(),"Length")
+	<< G4std::setw(6) << G4BestUnit(fTrack->GetPosition().z(),"Length")
+	<< G4std::setw(6) << G4BestUnit(fTrack->GetKineticEnergy(),"Energy")
+	<< G4std::setw(6) << G4BestUnit(fStep->GetTotalEnergyDeposit(),"Energy")
+	<< G4std::setw(6) << G4BestUnit(fStep->GetStepLength(),"Length")
+	<< G4std::setw(6) << G4BestUnit(fTrack->GetTrackLength(),"Length");

    if(fTrack->GetNextVolume()){
      G4cout << G4std::setw(10) << fTrack->GetVolume()->GetName();
@@ -173,4 +173,4 @@ G4int prec = G4cout.precision(3);
  G4cout.precision(prec);
 }

-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
@@ -21,11 +21,11 @@
 // ********************************************************************
 //
 //
-// $Id: ExN02TrackerHit.cc,v 1.4.4.1 2001/06/28 19:07:31 gunter Exp $
-// GEANT4 tag $Name:  $
+// $Id: ExN02TrackerHit.cc,v 1.6 2001/10/11 12:32:38 maire Exp $
+// GEANT4 tag $Name: geant4-04-00 $
 //
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

 #include "ExN02TrackerHit.hh"
 #include "G4UnitsTable.hh"
@@ -36,15 +36,15 @@

 G4Allocator<ExN02TrackerHit> ExN02TrackerHitAllocator;

-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

 ExN02TrackerHit::ExN02TrackerHit() {}

-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

 ExN02TrackerHit::~ExN02TrackerHit() {}

-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

 ExN02TrackerHit::ExN02TrackerHit(const ExN02TrackerHit& right)
 {
@@ -54,7 +54,7 @@ ExN02TrackerHit::ExN02TrackerHit(const ExN02TrackerHit& right)
  pos       = right.pos;
 }

-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

 const ExN02TrackerHit& ExN02TrackerHit::operator=(const ExN02TrackerHit& right)
 {
@@ -65,14 +65,14 @@ const ExN02TrackerHit& ExN02TrackerHit::operator=(const ExN02TrackerHit& right)
  return *this;
 }

-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

 int ExN02TrackerHit::operator==(const ExN02TrackerHit& right) const
 {
  return 0;
 }

-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

 void ExN02TrackerHit::Draw()
 {
@@ -89,7 +89,7 @@ void ExN02TrackerHit::Draw()
  }
 }

-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

 void ExN02TrackerHit::Print()
 {
@@ -98,5 +98,5 @@ void ExN02TrackerHit::Print()
 	 << "  position: " << G4BestUnit(pos,"Length") << G4endl;
 }

-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

@@ -21,11 +21,11 @@
 // ********************************************************************
 //
 //
-// $Id: ExN02TrackerSD.cc,v 1.3.4.1 2001/06/28 19:07:31 gunter Exp $
-// GEANT4 tag $Name:  $
+// $Id: ExN02TrackerSD.cc,v 1.5 2001/10/11 12:32:38 maire Exp $
+// GEANT4 tag $Name: geant4-04-00 $
 //
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

 #include "ExN02TrackerSD.hh"
 #include "G4HCofThisEvent.hh"
@@ -34,7 +34,7 @@
 #include "G4SDManager.hh"
 #include "G4ios.hh"

-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

 ExN02TrackerSD::ExN02TrackerSD(G4String name)
 :G4VSensitiveDetector(name)
@@ -43,11 +43,11 @@ ExN02TrackerSD::ExN02TrackerSD(G4String name)
  collectionName.insert(HCname="trackerCollection");
 }

-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

 ExN02TrackerSD::~ExN02TrackerSD(){ }

-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

 void ExN02TrackerSD::Initialize(G4HCofThisEvent* HCE)
 {
@@ -59,7 +59,7 @@ void ExN02TrackerSD::Initialize(G4HCofThisEvent* HCE)
  HCE->AddHitsCollection( HCID, trackerCollection ); 
 }

-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

 G4bool ExN02TrackerSD::ProcessHits(G4Step* aStep,G4TouchableHistory* ROhist)
 {
@@ -69,7 +69,8 @@ G4bool ExN02TrackerSD::ProcessHits(G4Step* aStep,G4TouchableHistory* ROhist)

  ExN02TrackerHit* newHit = new ExN02TrackerHit();
  newHit->SetTrackID  (aStep->GetTrack()->GetTrackID());
-  newHit->SetChamberNb(aStep->GetPreStepPoint()->GetTouchable()->GetReplicaNumber());
+  newHit->SetChamberNb(aStep->GetPreStepPoint()->GetTouchable()
+                                               ->GetReplicaNumber());
  newHit->SetEdep     (edep);
  newHit->SetPos      (aStep->GetPostStepPoint()->GetPosition());
  trackerCollection->insert( newHit );
@@ -80,7 +81,7 @@ G4bool ExN02TrackerSD::ProcessHits(G4Step* aStep,G4TouchableHistory* ROhist)
  return true;
 }

-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

 void ExN02TrackerSD::EndOfEvent(G4HCofThisEvent* HCE)
 {
@@ -92,5 +93,5 @@ void ExN02TrackerSD::EndOfEvent(G4HCofThisEvent* HCE)
    } 
 }

-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

@@ -21,14 +21,14 @@
 // ********************************************************************
 //
 //
-// $Id: ExN02VisManager.cc,v 1.3.4.1 2001/06/28 19:07:31 gunter Exp $
-// GEANT4 tag $Name:  $
+// $Id: ExN02VisManager.cc,v 1.7 2001/11/15 13:09:54 johna Exp $
+// GEANT4 tag $Name: geant4-04-00 $
 //
 // 
 // John Allison 24th January 1998.

-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

 #ifdef G4VIS_USE

@@ -36,14 +36,21 @@

 // Supported drivers...

+// Not needing external packages or libraries...
+#include "G4ASCIITree.hh"
+#include "G4DAWNFILE.hh"
+#include "G4GAGTree.hh"
+#include "G4HepRepFile.hh"
+#include "G4RayTracer.hh"
+#include "G4VRML1File.hh"
+#include "G4VRML2File.hh"
+
+// Needing external packages or libraries...
+
 #ifdef G4VIS_USE_DAWN
 #include "G4FukuiRenderer.hh"
 #endif

-#ifdef G4VIS_USE_DAWNFILE
-#include "G4DAWNFILE.hh"
-#endif
-
 #ifdef G4VIS_USE_OPACS
 #include "G4Wo.hh"
 #include "G4Xo.hh"
@@ -77,27 +84,29 @@
 #include "G4VRML2.hh"
 #endif

-#ifdef G4VIS_USE_VRMLFILE
-#include "G4VRML1File.hh"
-#include "G4VRML2File.hh"
-#endif
-
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

 ExN02VisManager::ExN02VisManager () {}

-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

 void ExN02VisManager::RegisterGraphicsSystems () {

+  // Graphics Systems not needing external packages or libraries...
+  RegisterGraphicsSystem (new G4ASCIITree);
+  RegisterGraphicsSystem (new G4DAWNFILE);
+  RegisterGraphicsSystem (new G4GAGTree);
+  RegisterGraphicsSystem (new G4HepRepFile);
+  RegisterGraphicsSystem (new G4RayTracer);
+  RegisterGraphicsSystem (new G4VRML1File);
+  RegisterGraphicsSystem (new G4VRML2File);
+
+  // Graphics systems needing external packages or libraries...
+
 #ifdef G4VIS_USE_DAWN
  RegisterGraphicsSystem (new G4FukuiRenderer);
 #endif

-#ifdef G4VIS_USE_DAWNFILE
-  RegisterGraphicsSystem (new G4DAWNFILE);
-#endif
-
 #ifdef G4VIS_USE_OPACS
  RegisterGraphicsSystem (new G4Wo);
  RegisterGraphicsSystem (new G4Xo);
@@ -131,11 +140,6 @@ void ExN02VisManager::RegisterGraphicsSystems () {
  RegisterGraphicsSystem (new G4VRML2);
 #endif

-#ifdef G4VIS_USE_VRMLFILE
-  RegisterGraphicsSystem (new G4VRML1File);
-  RegisterGraphicsSystem (new G4VRML2File);
-#endif
-
  if (fVerbose > 0) {
    G4cout <<
      "\nYou have successfully chosen to use the following graphics systems."
@@ -146,4 +150,4 @@ void ExN02VisManager::RegisterGraphicsSystems () {

 #endif

-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......