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,19 +21,19 @@
 // ********************************************************************
 //
 //
-// $Id: ExN03CalorHit.cc,v 1.2.4.1 2001/06/28 19:07:32 gunter Exp $
-// GEANT4 tag $Name:  $
+// $Id: ExN03CalorHit.cc,v 1.4 2001/10/10 14:58:12 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 "ExN03CalorHit.hh"

 G4Allocator<ExN03CalorHit> ExN03CalorHitAllocator;

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

 ExN03CalorHit::ExN03CalorHit()
 {
@@ -41,12 +41,12 @@ ExN03CalorHit::ExN03CalorHit()
   EdepGap = 0.; TrackLengthGap = 0.;
 }

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

 ExN03CalorHit::~ExN03CalorHit()
-{;}
+{}

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

 ExN03CalorHit::ExN03CalorHit(const ExN03CalorHit& right)
 {
@@ -54,7 +54,7 @@ ExN03CalorHit::ExN03CalorHit(const ExN03CalorHit& right)
  EdepGap = right.EdepGap; TrackLengthGap = right.TrackLengthGap;
 }

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

 const ExN03CalorHit& ExN03CalorHit::operator=(const ExN03CalorHit& right)
 {
@@ -63,22 +63,22 @@ const ExN03CalorHit& ExN03CalorHit::operator=(const ExN03CalorHit& right)
  return *this;
 }

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

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

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

 void ExN03CalorHit::Draw()
-{;}
+{}

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

 void ExN03CalorHit::Print()
-{;}
+{}

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

@@ -21,13 +21,13 @@
 // ********************************************************************
 //
 //
-// $Id: ExN03CalorimeterSD.cc,v 1.3.4.1 2001/06/28 19:07:32 gunter Exp $
-// GEANT4 tag $Name:  $
+// $Id: ExN03CalorimeterSD.cc,v 1.5 2001/10/10 14:58:12 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 "ExN03CalorimeterSD.hh"

@@ -42,7 +42,7 @@

 #include "G4ios.hh"

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

 ExN03CalorimeterSD::ExN03CalorimeterSD(G4String name,
                                   ExN03DetectorConstruction* det)
@@ -52,14 +52,14 @@ ExN03CalorimeterSD::ExN03CalorimeterSD(G4String name,
  HitID = new G4int[500];
 }

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

 ExN03CalorimeterSD::~ExN03CalorimeterSD()
 {
  delete [] HitID;
 }

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

 void ExN03CalorimeterSD::Initialize(G4HCofThisEvent*HCE)
 {
@@ -68,7 +68,7 @@ void ExN03CalorimeterSD::Initialize(G4HCofThisEvent*HCE)
  for (G4int j=0;j<Detector->GetNbOfLayers();j++) {HitID[j] = -1;};
 }

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

 G4bool ExN03CalorimeterSD::ProcessHits(G4Step* aStep,G4TouchableHistory* ROhist)
 {
@@ -86,7 +86,7 @@ G4bool ExN03CalorimeterSD::ProcessHits(G4Step* aStep,G4TouchableHistory* ROhist)
  G4VPhysicalVolume* physVol = theTouchable->GetVolume(); 
  //theTouchable->MoveUpHistory();
  G4int LayerNumber = 0;
-  if (Detector->GetNbOfLayers()>1) LayerNumber=theTouchable->GetReplicaNumber(1);
+  if(Detector->GetNbOfLayers()>1) LayerNumber=theTouchable->GetReplicaNumber(1);

  if (HitID[LayerNumber]==-1)
    { 
@@ -110,7 +110,7 @@ G4bool ExN03CalorimeterSD::ProcessHits(G4Step* aStep,G4TouchableHistory* ROhist)
  return true;
 }

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

 void ExN03CalorimeterSD::EndOfEvent(G4HCofThisEvent* HCE)
 {
@@ -120,20 +120,20 @@ void ExN03CalorimeterSD::EndOfEvent(G4HCofThisEvent* HCE)
  HCE->AddHitsCollection(HCID,CalCollection);
 }

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

 void ExN03CalorimeterSD::clear()
 {} 

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

 void ExN03CalorimeterSD::DrawAll()
 {} 

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

 void ExN03CalorimeterSD::PrintAll()
 {} 

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

@@ -21,13 +21,13 @@
 // ********************************************************************
 //
 //
-// $Id: ExN03DetectorConstruction.cc,v 1.4.4.1 2001/06/28 19:07:33 gunter Exp $
-// GEANT4 tag $Name:  $
+// $Id: ExN03DetectorConstruction.cc,v 1.10 2001/11/27 11:37: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 "ExN03DetectorConstruction.hh"
 #include "ExN03DetectorMessenger.hh"
@@ -50,16 +50,16 @@

 #include "G4ios.hh"

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

 ExN03DetectorConstruction::ExN03DetectorConstruction()
-:solidWorld(NULL),logicWorld(NULL),physiWorld(NULL),
- solidCalor(NULL),logicCalor(NULL),physiCalor(NULL),
- solidLayer(NULL),logicLayer(NULL),physiLayer(NULL),
- solidAbsorber(NULL),logicAbsorber(NULL),physiAbsorber(NULL),
- solidGap (NULL),logicGap (NULL),physiGap (NULL),
- AbsorberMaterial(NULL),GapMaterial(NULL),defaultMaterial(NULL),
- magField(NULL),calorimeterSD(NULL)
+:AbsorberMaterial(0),GapMaterial(0),defaultMaterial(0),
+ solidWorld(0),logicWorld(0),physiWorld(0),
+ solidCalor(0),logicCalor(0),physiCalor(0),
+ solidLayer(0),logicLayer(0),physiLayer(0),
+ solidAbsorber(0),logicAbsorber(0),physiAbsorber(0),
+ solidGap (0),logicGap (0),physiGap (0),
+ magField(0),calorimeterSD(0)
 {
  // default parameter values of the calorimeter
  AbsorberThickness = 10.*mm;
@@ -72,12 +72,12 @@ ExN03DetectorConstruction::ExN03DetectorConstruction()
  detectorMessenger = new ExN03DetectorMessenger(this);
 }

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

 ExN03DetectorConstruction::~ExN03DetectorConstruction()
 { delete detectorMessenger;}

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

 G4VPhysicalVolume* ExN03DetectorConstruction::Construct()
 {
@@ -85,7 +85,7 @@ G4VPhysicalVolume* ExN03DetectorConstruction::Construct()
  return ConstructCalorimeter();
 }

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

 void ExN03DetectorConstruction::DefineMaterials()
 { 
@@ -119,9 +119,6 @@ G4Element* O  = new G4Element(name="Oxygen"  ,symbol="O" , z= 8., a);
 a = 28.09*g/mole;
 G4Element* Si = new G4Element(name="Silicon",symbol="Si" , z= 14., a);

-a = 55.85*g/mole;
-G4Element* Fe = new G4Element(name="Iron"    ,symbol="Fe", z=26., a);
-
 //
 // define an Element from isotopes, by relative abundance 
 //
@@ -129,7 +126,7 @@ G4Element* Fe = new G4Element(name="Iron"    ,symbol="Fe", z=26., a);
 G4Isotope* U5 = new G4Isotope(name="U235", iz=92, n=235, a=235.01*g/mole);
 G4Isotope* U8 = new G4Isotope(name="U238", iz=92, n=238, a=238.03*g/mole);

-G4Element* U  = new G4Element(name="enriched Uranium", symbol="U", ncomponents=2);
+G4Element* U  = new G4Element(name="enriched Uranium",symbol="U",ncomponents=2);
 U->AddIsotope(U5, abundance= 90.*perCent);
 U->AddIsotope(U8, abundance= 10.*perCent);

@@ -137,18 +134,12 @@ U->AddIsotope(U8, abundance= 10.*perCent);
 // define simple materials
 //

-density = 2.700*g/cm3;
-a = 26.98*g/mole;
-G4Material* Al = new G4Material(name="Aluminium", z=13., a, density);
+new G4Material(name="Aluminium", z=13., a=26.98*g/mole, density=2.700*g/cm3);

 density = 1.390*g/cm3;
 a = 39.95*g/mole;
 G4Material* lAr = new G4Material(name="liquidArgon", z=18., a, density);

-density = 8.960*g/cm3;
-a = 63.55*g/mole;
-G4Material* Cu = new G4Material(name="Copper"   , z=29., a, density);
-
 density = 11.35*g/cm3;
 a = 207.19*g/mole;
 G4Material* Pb = new G4Material(name="Lead"     , z=82., a, density);
@@ -214,11 +205,11 @@ steam->AddMaterial(H2O, fractionmass=1.);
 // examples of vacuum
 //

-density     = universe_mean_density;    //from PhysicalConstants.h
+density     = universe_mean_density;
 pressure    = 3.e-18*pascal;
 temperature = 2.73*kelvin;
-new G4Material(name="Galactic", z=1., a=1.01*g/mole, density,
-                   kStateGas,temperature,pressure);
+G4Material* Vacuum = new G4Material(name="Galactic", z=1., a=1.01*g/mole,
+                                    density,kStateGas,temperature,pressure);

 density     = 1.e-5*g/cm3;
 pressure    = 2.e-2*bar;
@@ -232,10 +223,10 @@ G4cout << *(G4Material::GetMaterialTable()) << G4endl;
  //default materials of the calorimeter
  AbsorberMaterial = Pb;
  GapMaterial      = lAr;
-  defaultMaterial  = Air;
+  defaultMaterial  = Vacuum;
 }

-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
  
 G4VPhysicalVolume* ExN03DetectorConstruction::ConstructCalorimeter()
 {
@@ -256,15 +247,15 @@ G4VPhysicalVolume* ExN03DetectorConstruction::ConstructCalorimeter()
  				 G4ThreeVector(),	//at (0,0,0)
                                 "World",		//its name
                                 logicWorld,		//its logical volume
-                                 NULL,			//its mother  volume
+                                 0,			//its mother  volume
                                 false,			//no boolean operation
                                 0);			//copy number
  
  //                               
  // Calorimeter
  //  
-  solidCalor=NULL; logicCalor=NULL; physiCalor=NULL;
-  solidLayer=NULL; logicLayer=NULL; physiLayer=NULL;
+  solidCalor=0; logicCalor=0; physiCalor=0;
+  solidLayer=0; logicLayer=0; physiLayer=0;
  
  if (CalorThickness > 0.)  
    { solidCalor = new G4Box("Calorimeter",		//its name
@@ -311,7 +302,7 @@ G4VPhysicalVolume* ExN03DetectorConstruction::ConstructCalorimeter()
  //                               
  // Absorber
  //
-  solidAbsorber=NULL; logicAbsorber=NULL; physiAbsorber=NULL;  
+  solidAbsorber=0; logicAbsorber=0; physiAbsorber=0;  
  
  if (AbsorberThickness > 0.) 
    { solidAbsorber = new G4Box("Absorber",		//its name
@@ -334,7 +325,7 @@ G4VPhysicalVolume* ExN03DetectorConstruction::ConstructCalorimeter()
  //                                 
  // Gap
  //
-  solidGap=NULL; logicGap=NULL; physiGap=NULL; 
+  solidGap=0; logicGap=0; physiGap=0; 
  
  if (GapThickness > 0.)
    { solidGap = new G4Box("Gap",
@@ -383,7 +374,7 @@ G4VPhysicalVolume* ExN03DetectorConstruction::ConstructCalorimeter()
  return physiWorld;
 }

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

 void ExN03DetectorConstruction::PrintCalorParameters()
 {
@@ -395,7 +386,7 @@ void ExN03DetectorConstruction::PrintCalorParameters()
         << "\n------------------------------------------------------------\n";
 }

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

 void ExN03DetectorConstruction::SetAbsorberMaterial(G4String materialChoice)
 {
@@ -408,7 +399,7 @@ void ExN03DetectorConstruction::SetAbsorberMaterial(G4String materialChoice)
     }             
 }

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

 void ExN03DetectorConstruction::SetGapMaterial(G4String materialChoice)
 {
@@ -421,7 +412,7 @@ void ExN03DetectorConstruction::SetGapMaterial(G4String materialChoice)
     }             
 }

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

 void ExN03DetectorConstruction::SetAbsorberThickness(G4double val)
 {
@@ -429,7 +420,7 @@ void ExN03DetectorConstruction::SetAbsorberThickness(G4double val)
  AbsorberThickness = val;
 }  

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

 void ExN03DetectorConstruction::SetGapThickness(G4double val)
 {
@@ -437,7 +428,7 @@ void ExN03DetectorConstruction::SetGapThickness(G4double val)
  GapThickness = val;
 }  

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

 void ExN03DetectorConstruction::SetCalorSizeYZ(G4double val)
 {
@@ -445,14 +436,14 @@ void ExN03DetectorConstruction::SetCalorSizeYZ(G4double val)
  CalorSizeYZ = val;
 }  

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

 void ExN03DetectorConstruction::SetNbOfLayers(G4int val)
 {
  NbOfLayers = val;
 }

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

 void ExN03DetectorConstruction::SetMagField(G4double fieldValue)
 {
@@ -467,16 +458,16 @@ void ExN03DetectorConstruction::SetMagField(G4double fieldValue)
    fieldMgr->SetDetectorField(magField);
    fieldMgr->CreateChordFinder(magField);
  } else {
-    magField = NULL;
+    magField = 0;
    fieldMgr->SetDetectorField(magField);
  }
 }

-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
  
 void ExN03DetectorConstruction::UpdateGeometry()
 {
  G4RunManager::GetRunManager()->DefineWorldVolume(ConstructCalorimeter());
 }

-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
@@ -21,13 +21,13 @@
 // ********************************************************************
 //
 //
-// $Id: ExN03DetectorMessenger.cc,v 1.3.4.1 2001/06/28 19:07:33 gunter Exp $
-// GEANT4 tag $Name:  $
+// $Id: ExN03DetectorMessenger.cc,v 1.5 2001/10/10 14:58:12 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 "ExN03DetectorMessenger.hh"

@@ -38,9 +38,10 @@
 #include "G4UIcmdWithADoubleAndUnit.hh"
 #include "G4UIcmdWithoutParameter.hh"

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

-ExN03DetectorMessenger::ExN03DetectorMessenger(ExN03DetectorConstruction * ExN03Det)
+ExN03DetectorMessenger::ExN03DetectorMessenger(
+                                           ExN03DetectorConstruction* ExN03Det)
 :ExN03Detector(ExN03Det)
 { 
  ExN03detDir = new G4UIdirectory("/calor/");
@@ -97,7 +98,7 @@ ExN03DetectorMessenger::ExN03DetectorMessenger(ExN03DetectorConstruction * ExN03
  MagFieldCmd->AvailableForStates(Idle);  
 }

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

 ExN03DetectorMessenger::~ExN03DetectorMessenger()
 {
@@ -109,7 +110,7 @@ ExN03DetectorMessenger::~ExN03DetectorMessenger()
  delete ExN03detDir;
 }

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

 void ExN03DetectorMessenger::SetNewValue(G4UIcommand* command,G4String newValue)
 { 
@@ -120,7 +121,8 @@ void ExN03DetectorMessenger::SetNewValue(G4UIcommand* command,G4String newValue)
   { ExN03Detector->SetGapMaterial(newValue);}
  
  if( command == AbsThickCmd )
-   { ExN03Detector->SetAbsorberThickness(AbsThickCmd->GetNewDoubleValue(newValue));}
+   { ExN03Detector->SetAbsorberThickness(AbsThickCmd
+                                               ->GetNewDoubleValue(newValue));}
   
  if( command == GapThickCmd )
   { ExN03Detector->SetGapThickness(GapThickCmd->GetNewDoubleValue(newValue));}
@@ -138,4 +140,4 @@ void ExN03DetectorMessenger::SetNewValue(G4UIcommand* command,G4String newValue)
   { ExN03Detector->SetMagField(MagFieldCmd->GetNewDoubleValue(newValue));}
 }

-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
@@ -21,13 +21,13 @@
 // ********************************************************************
 //
 //
-// $Id: ExN03EventAction.cc,v 1.12.2.1 2001/06/28 19:07:33 gunter Exp $
-// GEANT4 tag $Name:  $
+// $Id: ExN03EventAction.cc,v 1.15 2001/11/05 08:24:51 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 "ExN03EventAction.hh"

@@ -46,23 +46,23 @@
 #include "G4ios.hh"
 #include "G4UnitsTable.hh"

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

 ExN03EventAction::ExN03EventAction()
-:calorimeterCollID(-1),drawFlag("all"),eventMessenger(NULL),
- printModulo(1)
+:calorimeterCollID(-1),drawFlag("all"),printModulo(1),
+ eventMessenger(0)
 {
  eventMessenger = new ExN03EventActionMessenger(this);
 }

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

 ExN03EventAction::~ExN03EventAction()
 {
  delete eventMessenger;
 }

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

 void ExN03EventAction::BeginOfEventAction(const G4Event* evt)
 {
@@ -81,7 +81,7 @@ void ExN03EventAction::BeginOfEventAction(const G4Event* evt)
   } 
 }

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

 void ExN03EventAction::EndOfEventAction(const G4Event* evt)
 {
@@ -91,7 +91,7 @@ void ExN03EventAction::EndOfEventAction(const G4Event* evt)
  // track length) in all absorbers and in all gaps

  G4HCofThisEvent* HCE = evt->GetHCofThisEvent();
-  ExN03CalorHitsCollection* CHC = NULL;
+  ExN03CalorHitsCollection* CHC = 0;
  G4int n_hit = 0;
  G4double totEAbs=0, totLAbs=0, totEGap=0, totLGap=0;
    
@@ -115,34 +115,39 @@ void ExN03EventAction::EndOfEventAction(const G4Event* evt)
    G4cout << "---> End of event: " << evtNb << G4endl;	

    G4cout
-       << "   Absorber: total energy: " << G4std::setw(7) << G4BestUnit(totEAbs,"Energy")
-       << "       total track length: " << G4std::setw(7) << G4BestUnit(totLAbs,"Length")
+       << "   Absorber: total energy: " << G4std::setw(7)
+                                        << G4BestUnit(totEAbs,"Energy")
+       << "       total track length: " << G4std::setw(7)
+                                        << G4BestUnit(totLAbs,"Length")
       << G4endl
-       << "        Gap: total energy: " << G4std::setw(7) << G4BestUnit(totEGap,"Energy")
-       << "       total track length: " << G4std::setw(7) << G4BestUnit(totLGap,"Length")
+       << "        Gap: total energy: " << G4std::setw(7)
+                                        << G4BestUnit(totEGap,"Energy")
+       << "       total track length: " << G4std::setw(7)
+                                        << G4BestUnit(totLGap,"Length")
       << G4endl;
 	  
    G4cout << "\n     " << n_hit
-	   << " hits are stored in ExN03CalorHitsCollection." << G4endl;  	     
+	   << " hits are stored in ExN03CalorHitsCollection." << G4endl;
  }
  
  // extract the trajectories and draw them
  
  if (G4VVisManager::GetConcreteInstance())
    {
-     G4TrajectoryContainer * trajectoryContainer = evt->GetTrajectoryContainer();
+     G4TrajectoryContainer* trajectoryContainer = evt->GetTrajectoryContainer();
     G4int n_trajectories = 0;
     if (trajectoryContainer) n_trajectories = trajectoryContainer->entries();

     for (G4int i=0; i<n_trajectories; i++) 
-        { G4Trajectory* trj = (G4Trajectory*)((*(evt->GetTrajectoryContainer()))[i]);
+        { G4Trajectory* trj = (G4Trajectory*)
+	                                ((*(evt->GetTrajectoryContainer()))[i]);
          if (drawFlag == "all") trj->DrawTrajectory(50);
          else if ((drawFlag == "charged")&&(trj->GetCharge() != 0.))
                                  trj->DrawTrajectory(50);
          else if ((drawFlag == "neutral")&&(trj->GetCharge() == 0.))
-                                  trj->DrawTrajectory(50);				   
+                                  trj->DrawTrajectory(50);
        }
-  }             
-}
+  }
+}  

-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
@@ -21,13 +21,13 @@
 // ********************************************************************
 //
 //
-// $Id: ExN03EventActionMessenger.cc,v 1.4.4.1 2001/06/28 19:07:33 gunter Exp $
-// GEANT4 tag $Name:  $
+// $Id: ExN03EventActionMessenger.cc,v 1.6 2001/10/10 14:58:12 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 "ExN03EventActionMessenger.hh"

@@ -36,7 +36,7 @@
 #include "G4UIcmdWithAnInteger.hh"
 #include "globals.hh"

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

 ExN03EventActionMessenger::ExN03EventActionMessenger(ExN03EventAction* EvAct)
 :eventAction(EvAct)
@@ -56,7 +56,7 @@ ExN03EventActionMessenger::ExN03EventActionMessenger(ExN03EventAction* EvAct)
  PrintCmd->AvailableForStates(Idle);     
 }

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

 ExN03EventActionMessenger::~ExN03EventActionMessenger()
 {
@@ -64,15 +64,16 @@ ExN03EventActionMessenger::~ExN03EventActionMessenger()
  delete PrintCmd;   
 }

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

-void ExN03EventActionMessenger::SetNewValue(G4UIcommand * command,G4String newValue)
+void ExN03EventActionMessenger::SetNewValue(
+                                        G4UIcommand* command,G4String newValue)
 { 
  if(command == DrawCmd)
    {eventAction->SetDrawFlag(newValue);}
       
  if(command == PrintCmd)
-    {eventAction->SetPrintModulo(PrintCmd->GetNewIntValue(newValue));}              
+    {eventAction->SetPrintModulo(PrintCmd->GetNewIntValue(newValue));}
 }

-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
@@ -21,13 +21,13 @@
 // ********************************************************************
 //
 //
-// $Id: ExN03PhysicsList.cc,v 1.9.4.1 2001/06/28 19:07:33 gunter Exp $
-// GEANT4 tag $Name:  $
+// $Id: ExN03PhysicsList.cc,v 1.11 2001/10/10 14:58:12 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 "ExN03PhysicsList.hh"

@@ -40,7 +40,7 @@
 #include "G4Material.hh"
 #include "G4ios.hh"              

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

 ExN03PhysicsList::ExN03PhysicsList():  G4VUserPhysicsList()
 {
@@ -52,12 +52,12 @@ ExN03PhysicsList::ExN03PhysicsList():  G4VUserPhysicsList()
 SetVerboseLevel(1);
 }

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

 ExN03PhysicsList::~ExN03PhysicsList()
 {}

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

 void ExN03PhysicsList::ConstructParticle()
 {
@@ -72,7 +72,7 @@ void ExN03PhysicsList::ConstructParticle()
  ConstructBaryons();
 }

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

 void ExN03PhysicsList::ConstructBosons()
 {
@@ -86,7 +86,8 @@ void ExN03PhysicsList::ConstructBosons()
  // optical photon
  G4OpticalPhoton::OpticalPhotonDefinition();
 }
- //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

 void ExN03PhysicsList::ConstructLeptons()
 {
@@ -102,7 +103,7 @@ void ExN03PhysicsList::ConstructLeptons()
  G4AntiNeutrinoMu::AntiNeutrinoMuDefinition();
 }

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

 void ExN03PhysicsList::ConstructMesons()
 {
@@ -120,7 +121,7 @@ void ExN03PhysicsList::ConstructMesons()
  G4KaonZeroShort::KaonZeroShortDefinition();
 }

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

 void ExN03PhysicsList::ConstructBaryons()
 {
@@ -132,7 +133,7 @@ void ExN03PhysicsList::ConstructBaryons()
 }


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

 void ExN03PhysicsList::ConstructProcess()
 {
@@ -141,7 +142,7 @@ void ExN03PhysicsList::ConstructProcess()
  ConstructGeneral();
 }

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

 #include "G4ComptonScattering.hh"
 #include "G4GammaConversion.hh"
@@ -159,7 +160,7 @@ void ExN03PhysicsList::ConstructProcess()

 #include "G4hIonisation.hh"

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

 void ExN03PhysicsList::ConstructEM()
 {
@@ -267,7 +268,7 @@ void ExN03PhysicsList::ConstructEM()
  }
 }

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

 #include "G4Decay.hh"

@@ -288,7 +289,7 @@ void ExN03PhysicsList::ConstructGeneral()
  }
 }

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

 void ExN03PhysicsList::SetCuts()
 {
@@ -303,7 +304,7 @@ void ExN03PhysicsList::SetCuts()
    
  if (verboseLevel >0){
    G4cout << "ExN03PhysicsList::SetCuts:";
-    G4cout << "CutLength : " << G4BestUnit(defaultCutValue,"Length") << G4endl;    
+    G4cout << "CutLength : " << G4BestUnit(defaultCutValue,"Length") << G4endl;
  }  

  // set cut values for gamma at first and for e- second and next for e+,
@@ -322,7 +323,7 @@ void ExN03PhysicsList::SetCuts()
  if (verboseLevel>0) DumpCutValuesTable();
 }

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


 void ExN03PhysicsList::SetCutForGamma(G4double cut)
@@ -358,15 +359,5 @@ G4double ExN03PhysicsList::GetCutForProton() const
  return cutForProton;
 }

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

@@ -21,13 +21,13 @@
 // ********************************************************************
 //
 //
-// $Id: ExN03PrimaryGeneratorAction.cc,v 1.3.4.1 2001/06/28 19:07:33 gunter Exp $
-// GEANT4 tag $Name:  $
+// $Id: ExN03PrimaryGeneratorAction.cc,v 1.5 2001/10/10 14:58:12 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 "ExN03PrimaryGeneratorAction.hh"

@@ -40,10 +40,10 @@
 #include "G4ParticleDefinition.hh"
 #include "Randomize.hh"

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

 ExN03PrimaryGeneratorAction::ExN03PrimaryGeneratorAction(
-                                               ExN03DetectorConstruction* ExN03DC)
+                                             ExN03DetectorConstruction* ExN03DC)
 :ExN03Detector(ExN03DC),rndmFlag("off")
 {
  G4int n_particle = 1;
@@ -66,7 +66,7 @@ ExN03PrimaryGeneratorAction::ExN03PrimaryGeneratorAction(

 }

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

 ExN03PrimaryGeneratorAction::~ExN03PrimaryGeneratorAction()
 {
@@ -74,7 +74,7 @@ ExN03PrimaryGeneratorAction::~ExN03PrimaryGeneratorAction()
  delete gunMessenger;
 }

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

 void ExN03PrimaryGeneratorAction::GeneratePrimaries(G4Event* anEvent)
 {
@@ -91,5 +91,5 @@ void ExN03PrimaryGeneratorAction::GeneratePrimaries(G4Event* anEvent)
  particleGun->GeneratePrimaryVertex(anEvent);
 }

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

@@ -21,22 +21,23 @@
 // ********************************************************************
 //
 //
-// $Id: ExN03PrimaryGeneratorMessenger.cc,v 1.3.4.1 2001/06/28 19:07:33 gunter Exp $
-// GEANT4 tag $Name:  $
+// $Id: ExN03PrimaryGeneratorMessenger.cc,v 1.5 2001/10/10 14:58:12 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 "ExN03PrimaryGeneratorMessenger.hh"

 #include "ExN03PrimaryGeneratorAction.hh"
 #include "G4UIcmdWithAString.hh"

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

-ExN03PrimaryGeneratorMessenger::ExN03PrimaryGeneratorMessenger(ExN03PrimaryGeneratorAction* ExN03Gun)
+ExN03PrimaryGeneratorMessenger::ExN03PrimaryGeneratorMessenger(
+                                          ExN03PrimaryGeneratorAction* ExN03Gun)
 :ExN03Action(ExN03Gun)
 { 
  RndmCmd = new G4UIcmdWithAString("/gun/random",this);
@@ -48,20 +49,21 @@ ExN03PrimaryGeneratorMessenger::ExN03PrimaryGeneratorMessenger(ExN03PrimaryGener
  RndmCmd->AvailableForStates(PreInit,Idle);
 }

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

 ExN03PrimaryGeneratorMessenger::~ExN03PrimaryGeneratorMessenger()
 {
  delete RndmCmd;
 }

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

-void ExN03PrimaryGeneratorMessenger::SetNewValue(G4UIcommand * command,G4String newValue)
+void ExN03PrimaryGeneratorMessenger::SetNewValue(
+                                        G4UIcommand* command, G4String newValue)
 { 
  if( command == RndmCmd )
   { ExN03Action->SetRndmFlag(newValue);}
 }

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

@@ -21,13 +21,13 @@
 // ********************************************************************
 //
 //
-// $Id: ExN03RunAction.cc,v 1.7.4.1 2001/06/28 19:07:33 gunter Exp $
-// GEANT4 tag $Name:  $
+// $Id: ExN03RunAction.cc,v 1.9 2001/10/10 14:58:12 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 "ExN03RunAction.hh"

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

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

 ExN03RunAction::ExN03RunAction()
-{
-}
+{}

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

 ExN03RunAction::~ExN03RunAction()
 {}

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

 void ExN03RunAction::BeginOfRunAction(const G4Run* aRun)
 {
@@ -61,7 +60,7 @@ void ExN03RunAction::BeginOfRunAction(const G4Run* aRun)
    } 
 }

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

 void ExN03RunAction::EndOfRunAction(const G4Run* )
 {
@@ -70,4 +69,4 @@ void ExN03RunAction::EndOfRunAction(const G4Run* )
  }
 }

-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
@@ -21,32 +21,32 @@
 // ********************************************************************
 //
 //
-// $Id: ExN03SteppingAction.cc,v 1.3.4.1 2001/06/28 19:07:33 gunter Exp $
-// GEANT4 tag $Name:  $
+// $Id: ExN03SteppingAction.cc,v 1.5 2001/10/10 14:58:13 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 "ExN03SteppingAction.hh"

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

 ExN03SteppingAction::ExN03SteppingAction()
 { }

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

 ExN03SteppingAction::~ExN03SteppingAction()
 { }

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

 void ExN03SteppingAction::UserSteppingAction(const G4Step*)
 { }

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



@@ -21,28 +21,28 @@
 // ********************************************************************
 //
 //
-// $Id: ExN03SteppingVerbose.cc,v 1.5.2.1 2001/06/28 19:07:33 gunter Exp $
-// GEANT4 tag $Name:  $
+// $Id: ExN03SteppingVerbose.cc,v 1.8 2001/11/05 08:24:51 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 "ExN03SteppingVerbose.hh"

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

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

 ExN03SteppingVerbose::ExN03SteppingVerbose()
 {}

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

 ExN03SteppingVerbose::~ExN03SteppingVerbose()
 {}

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

 void ExN03SteppingVerbose::StepInfo()
 {
@@ -66,14 +66,14 @@ void ExN03SteppingVerbose::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 ) { 
@@ -82,10 +82,11 @@ void ExN03SteppingVerbose::StepInfo()
      G4cout << G4std::setw(10) << "OutOfWorld";
    }

-    if(fStep->GetPostStepPoint()->GetProcessDefinedStep() != NULL){
+    if(fStep->GetPostStepPoint()->GetProcessDefinedStep() != 0){
      G4cout << "  "
-             << G4std::setw(10) << fStep->GetPostStepPoint()->GetProcessDefinedStep()
-	                                ->GetProcessName();
+             << G4std::setw(10)
+	     << fStep->GetPostStepPoint()->GetProcessDefinedStep()
+	                                 ->GetProcessName();
    } else {
      G4cout << "   UserLimit";
    }
@@ -107,7 +108,7 @@ void ExN03SteppingVerbose::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 +135,7 @@ void ExN03SteppingVerbose::StepInfo()
  G4cout.precision(prec);
 }

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

 void ExN03SteppingVerbose::TrackingStarted()
 {
@@ -154,14 +155,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 +174,4 @@ G4int prec = G4cout.precision(3);
  G4cout.precision(prec);
 }

-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
@@ -21,14 +21,14 @@
 // ********************************************************************
 //
 //
-// $Id: ExN03VisManager.cc,v 1.5.2.1 2001/06/28 19:07:33 gunter Exp $
-// GEANT4 tag $Name:  $
+// $Id: ExN03VisManager.cc,v 1.8 2001/11/15 13:09:56 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,18 +36,21 @@

 // Supported drivers...

-#ifdef G4VIS_USE_ASCIITREE
+// Not needing external packages or libraries...
 #include "G4ASCIITree.hh"
-#endif
+#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"
@@ -76,40 +79,34 @@
 #include "G4OpenInventorWin32.hh"
 #endif

-#ifdef G4VIS_USE_RAYTRACER
-#include "G4RayTracer.hh"
-#endif
-
 #ifdef G4VIS_USE_VRML
 #include "G4VRML1.hh"
 #include "G4VRML2.hh"
 #endif

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

 ExN03VisManager::ExN03VisManager () {}

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

 void ExN03VisManager::RegisterGraphicsSystems () {

-#ifdef G4VIS_USE_ASCIITREE
+  // Graphics Systems not needing external packages or libraries...
  RegisterGraphicsSystem (new G4ASCIITree);
-#endif
+  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);
@@ -138,20 +135,11 @@ void ExN03VisManager::RegisterGraphicsSystems () {
  RegisterGraphicsSystem (new G4OpenInventorWin32);
 #endif

-#ifdef G4VIS_USE_RAYTRACER
-  RegisterGraphicsSystem (new G4RayTracer);
-#endif
-
 #ifdef G4VIS_USE_VRML
  RegisterGraphicsSystem (new G4VRML1);
  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."
@@ -162,4 +150,4 @@ void ExN03VisManager::RegisterGraphicsSystems () {

 #endif

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