Import Geant4 9.6.0 source tree

examples/novice/N04/src/ExN04CalorimeterParametrisation.cc

@@ -29,6 +29,7 @@
 #include "G4VPhysicalVolume.hh"
 #include "G4ThreeVector.hh"
 #include "G4Tubs.hh"
+#include "G4SystemOfUnits.hh"
 
 ExN04CalorimeterParametrisation::ExN04CalorimeterParametrisation()
 {

examples/novice/N04/src/ExN04CalorimeterROGeometry.cc

@@ -36,6 +36,7 @@
 #include "G4ThreeVector.hh"
 #include "G4Material.hh"
 #include "G4VisAttributes.hh"
+#include "G4SystemOfUnits.hh"
 
 ExN04CalorimeterROGeometry::ExN04CalorimeterROGeometry()
   : G4VReadOutGeometry()
@@ -65,21 +66,21 @@ G4VPhysicalVolume* ExN04CalorimeterROGeometry::Build()
   //Builds the ReadOut World:
   G4Box *ROWorldBox = new G4Box("ROWorldBox", expHall_x, expHall_y, expHall_z);
   G4LogicalVolume *ROWorldLog = new G4LogicalVolume(ROWorldBox, dummyMat,
-						    "ROWorldLogical", 0, 0, 0);
+                                                    "ROWorldLogical", 0, 0, 0);
   ROWorldLog->SetVisAttributes(G4VisAttributes::Invisible);
   G4PVPlacement *ROWorldPhys = new G4PVPlacement(0,G4ThreeVector(),
-						 "ROWorldPhysical",
-						 ROWorldLog,
-						 0,false,0);
+                                                 "ROWorldPhysical",
+                                                 ROWorldLog,
+                                                 0,false,0);
   // Calorimeter volume:
   G4VSolid * caloROtub
     = new G4Tubs("caloROtub",caloTubs_rmin,caloTubs_rmax,
-		 caloTubs_dz,caloTubs_sphi,caloTubs_dphi);
+                 caloTubs_dz,caloTubs_sphi,caloTubs_dphi);
   G4LogicalVolume * caloROlog
     = new G4LogicalVolume(caloROtub,dummyMat,"caloROlogical",0,0,0);
   G4VPhysicalVolume * caloROphys
     = new G4PVPlacement(0,G4ThreeVector(),"calROphysical",caloROlog,
-			ROWorldPhys,false,0);
+                        ROWorldPhys,false,0);
 
   // -------------------------------
   // Calorimeter readout division:
@@ -87,21 +88,21 @@ G4VPhysicalVolume* ExN04CalorimeterROGeometry::Build()
   // Phi division first: 48 sectors
   G4VSolid * caloROphiDivisionTub
     = new G4Tubs("caloROphiDivision", caloCell_rmin, caloCell_rmax,
-		 caloCell_dz, caloCell_sphi, caloCell_dphi);
+                 caloCell_dz, caloCell_sphi, caloCell_dphi);
   G4LogicalVolume * caloROphiDivisionLog
     = new G4LogicalVolume(caloROphiDivisionTub, dummyMat, "caloROphiDivisionLogical",0,0,0);
   G4VPhysicalVolume * caloROphiDivisionPhys
     = new G4PVReplica("caloROphiDivisionPhysical", caloROphiDivisionLog, caloROphys,
-		      kPhi, segmentsinPhi, caloCell_dphi);
+                      kPhi, segmentsinPhi, caloCell_dphi);
   // then z division: 20 slices:
   G4VSolid * caloROcellTub
     = new G4Tubs("caloROcellTub", caloRing_rmin, caloRing_rmax,
-		 caloRing_dz, caloRing_sphi, caloRing_dphi);
+                 caloRing_dz, caloRing_sphi, caloRing_dphi);
   G4LogicalVolume * caloROcellLog
     = new G4LogicalVolume(caloROcellTub, dummyMat, "caloROcellLogical",0,0,0);
 //  G4VPhysicalVolume * caloROcellPhys =
       new G4PVReplica("caloROcellPhysical", caloROcellLog, caloROphiDivisionPhys,
-		      kZAxis, segmentsinZ,2.*caloRing_dz);
+                      kZAxis, segmentsinZ,2.*caloRing_dz);
   
 
   //Flags the cells as sensitive .The pointer here serves

examples/novice/N04/src/ExN04CalorimeterSD.cc

@@ -33,6 +33,7 @@
 #include "G4ParticleDefinition.hh"
 #include "G4VTouchable.hh"
 #include "G4TouchableHistory.hh"
+#include "G4SystemOfUnits.hh"
 #include "G4ios.hh"
 
 ExN04CalorimeterSD::ExN04CalorimeterSD(G4String name)

examples/novice/N04/src/ExN04DetectorConstruction.cc

@@ -50,6 +50,7 @@
 #include "G4SDManager.hh"
 #include "G4VisAttributes.hh"
 #include "G4Colour.hh"
+#include "G4SystemOfUnits.hh"
 
 ExN04DetectorConstruction::ExN04DetectorConstruction()
 {
@@ -146,7 +147,7 @@ G4VPhysicalVolume* ExN04DetectorConstruction::Construct()
     = new G4LogicalVolume(tracker_tubs,Ar,"trackerT_L",0,0,0);
   // G4VPhysicalVolume * tracker_phys =
       new G4PVPlacement(0,G4ThreeVector(),tracker_log,"tracker_phys",
-			experimentalHall_log,false,0);
+                        experimentalHall_log,false,0);
   G4VisAttributes* tracker_logVisAtt
     = new G4VisAttributes(G4Colour(1.0,0.0,1.0));
   tracker_log->SetVisAttributes(tracker_logVisAtt);
@@ -164,7 +165,7 @@ G4VPhysicalVolume* ExN04DetectorConstruction::Construct()
   // dummy value : kXAxis -- modified by parameterised volume
   // G4VPhysicalVolume *trackerLayer_phys =
       new G4PVParameterised("trackerLayer_phys",trackerLayer_log,tracker_log,
-			   kXAxis, notrkLayers, trackerParam);
+                           kXAxis, notrkLayers, trackerParam);
   G4VisAttributes* trackerLayer_logVisAtt
     = new G4VisAttributes(G4Colour(0.5,0.0,1.0));
   trackerLayer_logVisAtt->SetForceWireframe(true);
@@ -173,12 +174,12 @@ G4VPhysicalVolume* ExN04DetectorConstruction::Construct()
   //------------------------------ calorimeter
   G4VSolid * calorimeter_tubs
     = new G4Tubs("calorimeter_tubs",caloTubs_rmin,caloTubs_rmax,
-		  caloTubs_dz,caloTubs_sphi,caloTubs_dphi);
+                  caloTubs_dz,caloTubs_sphi,caloTubs_dphi);
   G4LogicalVolume * calorimeter_log
     = new G4LogicalVolume(calorimeter_tubs,Scinti,"caloT_L",0,0,0);
   // G4VPhysicalVolume * calorimeter_phys =
       new G4PVPlacement(0,G4ThreeVector(),calorimeter_log,"caloM_P",
-			experimentalHall_log,false,0);
+                        experimentalHall_log,false,0);
   G4VisAttributes* calorimeter_logVisATT
     = new G4VisAttributes(G4Colour(1.0,1.0,0.0));
   calorimeter_logVisATT->SetForceWireframe(true);
@@ -189,7 +190,7 @@ G4VPhysicalVolume* ExN04DetectorConstruction::Construct()
   // dummy values for G4Tubs -- modified by parameterised volume
   G4VSolid * caloLayer_tubs
     = new G4Tubs("caloLayer_tubs",caloRing_rmin,caloRing_rmax,
-		  caloRing_dz,caloRing_sphi,caloRing_dphi);
+                  caloRing_dz,caloRing_sphi,caloRing_dphi);
   G4LogicalVolume * caloLayer_log
     = new G4LogicalVolume(caloLayer_tubs,Lead,"caloR_L",0,0,0);
   G4VPVParameterisation * calorimeterParam
@@ -197,7 +198,7 @@ G4VPhysicalVolume* ExN04DetectorConstruction::Construct()
   // dummy value : kXAxis -- modified by parameterised volume
   // G4VPhysicalVolume * caloLayer_phys =
       new G4PVParameterised("caloLayer_phys",caloLayer_log,calorimeter_log,
-			   kXAxis, nocaloLayers, calorimeterParam);
+                           kXAxis, nocaloLayers, calorimeterParam);
   G4VisAttributes* caloLayer_logVisAtt
     = new G4VisAttributes(G4Colour(0.7,1.0,0.0));
   caloLayer_log->SetVisAttributes(caloLayer_logVisAtt);
@@ -206,7 +207,7 @@ G4VPhysicalVolume* ExN04DetectorConstruction::Construct()
   // As an example of CSG volumes with rotation
   G4VSolid * muoncounter_box
     = new G4Box("muoncounter_box",muBox_width,muBox_thick,
-		muBox_length);
+                muBox_length);
   G4LogicalVolume * muoncounter_log
     = new G4LogicalVolume(muoncounter_box,Scinti,"mucounter_L",0,0,0);
   for(int i=0; i<nomucounter ; i++)

examples/novice/N04/src/ExN04EventAction.cc

@@ -39,6 +39,7 @@
 #include "G4VVisManager.hh"
 #include "G4SDManager.hh"
 #include "G4UImanager.hh"
+#include "G4SystemOfUnits.hh"
 #include "G4ios.hh"
 
 ExN04EventAction::ExN04EventAction()

examples/novice/N04/src/ExN04Field.cc

@@ -25,6 +25,7 @@
 //
 
 #include "ExN04Field.hh"
+#include "G4SystemOfUnits.hh"
 
 ExN04Field::ExN04Field()
 {

examples/novice/N04/src/ExN04MuonSD.cc

@@ -30,6 +30,7 @@
 #include "G4TouchableHistory.hh"
 #include "G4Track.hh"
 #include "G4Step.hh"
+#include "G4SystemOfUnits.hh"
 #include "G4ios.hh"
 
 ExN04MuonSD::ExN04MuonSD(G4String name)

examples/novice/N04/src/ExN04PrimaryGeneratorAction.cc

@@ -25,13 +25,14 @@
 //
 
 #include "ExN04PrimaryGeneratorAction.hh"
+#include "ExN04PrimaryGeneratorMessenger.hh"
 
 #include "G4Event.hh"
 #include "G4HEPEvtInterface.hh"
 #include "G4ParticleGun.hh"
 #include "G4ParticleTable.hh"
 #include "G4ParticleDefinition.hh"
-#include "ExN04PrimaryGeneratorMessenger.hh"
+#include "G4SystemOfUnits.hh"
 
 ExN04PrimaryGeneratorAction::ExN04PrimaryGeneratorAction()
 {

examples/novice/N04/src/ExN04RunAction.cc

@@ -24,8 +24,7 @@
 // ********************************************************************
 //
 //
-// $Id: ExN04RunAction.cc,v 1.5 2006-06-29 17:51:44 gunter Exp $
-// GEANT4 tag $Name: not supported by cvs2svn $
+// $Id$
 // 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

examples/novice/N04/src/ExN04StackingAction.cc

@@ -34,6 +34,7 @@
 #include "G4ParticleDefinition.hh"
 #include "G4ParticleTypes.hh"
 #include "ExN04StackingActionMessenger.hh"
+#include "G4SystemOfUnits.hh"
 #include "G4ios.hh"
 
 ExN04StackingAction::ExN04StackingAction()

examples/novice/N04/src/ExN04SteppingVerbose.cc

@@ -24,8 +24,7 @@
 // ********************************************************************
 //
 //
-// $Id: ExN04SteppingVerbose.cc,v 1.4 2006-06-29 17:51:55 gunter Exp $
-// GEANT4 tag $Name: not supported by cvs2svn $
+// $Id$
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
@@ -58,26 +57,26 @@ void ExN04SteppingVerbose::StepInfo()
     if( verboseLevel >= 3 ){
       G4cout << G4endl;    
       G4cout << std::setw( 5) << "#Step#"     << " "
-	     << std::setw( 6) << "X"          << "    "
-	     << std::setw( 6) << "Y"          << "    "  
-	     << std::setw( 6) << "Z"          << "    "
-	     << std::setw( 9) << "KineE"      << " "
-	     << std::setw( 9) << "dEStep"     << " "  
-	     << std::setw(10) << "StepLeng"     
-	     << std::setw(10) << "TrakLeng" 
-	     << std::setw(10) << "Volume"    << "  "
-	     << std::setw(10) << "Process"   << G4endl;	          
+             << std::setw( 6) << "X"          << "    "
+             << std::setw( 6) << "Y"          << "    "  
+             << std::setw( 6) << "Z"          << "    "
+             << std::setw( 9) << "KineE"      << " "
+             << std::setw( 9) << "dEStep"     << " "  
+             << std::setw(10) << "StepLeng"     
+             << std::setw(10) << "TrakLeng" 
+             << std::setw(10) << "Volume"    << "  "
+             << std::setw(10) << "Process"   << G4endl;                  
     }
 
     G4cout << std::setw(5) << fTrack->GetCurrentStepNumber() << " "
-	<< std::setw(6) << G4BestUnit(fTrack->GetPosition().x(),"Length")
-	<< std::setw(6) << G4BestUnit(fTrack->GetPosition().y(),"Length")
-	<< std::setw(6) << G4BestUnit(fTrack->GetPosition().z(),"Length")
-	<< std::setw(6) << G4BestUnit(fTrack->GetKineticEnergy(),"Energy")
-	<< std::setw(6) << G4BestUnit(fStep->GetTotalEnergyDeposit(),"Energy")
-	<< std::setw(6) << G4BestUnit(fStep->GetStepLength(),"Length")
-	<< std::setw(6) << G4BestUnit(fTrack->GetTrackLength(),"Length")
-	<< "  ";
+        << std::setw(6) << G4BestUnit(fTrack->GetPosition().x(),"Length")
+        << std::setw(6) << G4BestUnit(fTrack->GetPosition().y(),"Length")
+        << std::setw(6) << G4BestUnit(fTrack->GetPosition().z(),"Length")
+        << std::setw(6) << G4BestUnit(fTrack->GetKineticEnergy(),"Energy")
+        << std::setw(6) << G4BestUnit(fStep->GetTotalEnergyDeposit(),"Energy")
+        << std::setw(6) << G4BestUnit(fStep->GetStepLength(),"Length")
+        << std::setw(6) << G4BestUnit(fTrack->GetTrackLength(),"Length")
+        << "  ";
 
     // if( fStepStatus != fWorldBoundary){ 
     if( fTrack->GetNextVolume() != 0 ) { 
@@ -89,7 +88,7 @@ void ExN04SteppingVerbose::StepInfo()
     if(fStep->GetPostStepPoint()->GetProcessDefinedStep() != NULL){
       G4cout << "  " 
         << std::setw(10) << fStep->GetPostStepPoint()->GetProcessDefinedStep()
-	                                ->GetProcessName();
+                                        ->GetProcessName();
     } else {
       G4cout << "   UserLimit";
     }
@@ -98,39 +97,39 @@ void ExN04SteppingVerbose::StepInfo()
 
     if( verboseLevel == 2 ){
       G4int tN2ndariesTot = fN2ndariesAtRestDoIt +
-	                    fN2ndariesAlongStepDoIt +
-	                    fN2ndariesPostStepDoIt;
+                            fN2ndariesAlongStepDoIt +
+                            fN2ndariesPostStepDoIt;
       if(tN2ndariesTot>0){
-	G4cout << "    :----- List of 2ndaries - "
-	       << "#SpawnInStep=" << std::setw(3) << tN2ndariesTot 
-	       << "(Rest="  << std::setw(2) << fN2ndariesAtRestDoIt
-	       << ",Along=" << std::setw(2) << fN2ndariesAlongStepDoIt
-	       << ",Post="  << std::setw(2) << fN2ndariesPostStepDoIt
-	       << "), "
-	       << "#SpawnTotal=" << std::setw(3) << (*fSecondary).size()
-	       << " ---------------"
-	       << G4endl;
+        G4cout << "    :----- List of 2ndaries - "
+               << "#SpawnInStep=" << std::setw(3) << tN2ndariesTot 
+               << "(Rest="  << std::setw(2) << fN2ndariesAtRestDoIt
+               << ",Along=" << std::setw(2) << fN2ndariesAlongStepDoIt
+               << ",Post="  << std::setw(2) << fN2ndariesPostStepDoIt
+               << "), "
+               << "#SpawnTotal=" << std::setw(3) << (*fSecondary).size()
+               << " ---------------"
+               << G4endl;
 
-	for(size_t lp1=(*fSecondary).size()-tN2ndariesTot; 
+        for(size_t lp1=(*fSecondary).size()-tN2ndariesTot; 
                         lp1<(*fSecondary).size(); lp1++){
-	  G4cout << "    : "
-		 << std::setw(6)
-		 << G4BestUnit((*fSecondary)[lp1]->GetPosition().x(),"Length")
-		 << std::setw(6)
-		 << G4BestUnit((*fSecondary)[lp1]->GetPosition().y(),"Length")
-		 << std::setw(6)
-		 << G4BestUnit((*fSecondary)[lp1]->GetPosition().z(),"Length")
-		 << std::setw(6)
-		 << G4BestUnit((*fSecondary)[lp1]->GetKineticEnergy(),"Energy")
-		 << std::setw(10)
-		 << (*fSecondary)[lp1]->GetDefinition()->GetParticleName();
-	  G4cout << G4endl;
-	}
+          G4cout << "    : "
+                 << std::setw(6)
+                 << G4BestUnit((*fSecondary)[lp1]->GetPosition().x(),"Length")
+                 << std::setw(6)
+                 << G4BestUnit((*fSecondary)[lp1]->GetPosition().y(),"Length")
+                 << std::setw(6)
+                 << G4BestUnit((*fSecondary)[lp1]->GetPosition().z(),"Length")
+                 << std::setw(6)
+                 << G4BestUnit((*fSecondary)[lp1]->GetKineticEnergy(),"Energy")
+                 << std::setw(10)
+                 << (*fSecondary)[lp1]->GetDefinition()->GetParticleName();
+          G4cout << G4endl;
+        }
               
-	G4cout << "    :-----------------------------"
-	       << "----------------------------------"
-	       << "-- EndOf2ndaries Info ---------------"
-	       << G4endl;
+        G4cout << "    :-----------------------------"
+               << "----------------------------------"
+               << "-- EndOf2ndaries Info ---------------"
+               << G4endl;
       }
     }
     
@@ -149,24 +148,24 @@ G4int prec = G4cout.precision(3);
 
     G4cout << std::setw( 5) << "Step#"      << " "
            << std::setw( 6) << "X"          << "    "
-	   << std::setw( 6) << "Y"          << "    "  
-	   << std::setw( 6) << "Z"          << "    "
-	   << std::setw( 9) << "KineE"      << " "
-	   << std::setw( 9) << "dEStep"     << " "  
-	   << std::setw(10) << "StepLeng"  
-	   << std::setw(10) << "TrakLeng"
-	   << std::setw(10) << "Volume"     << "  "
-	   << std::setw(10) << "Process"    << G4endl;	     
+           << std::setw( 6) << "Y"          << "    "  
+           << std::setw( 6) << "Z"          << "    "
+           << std::setw( 9) << "KineE"      << " "
+           << std::setw( 9) << "dEStep"     << " "  
+           << std::setw(10) << "StepLeng"  
+           << std::setw(10) << "TrakLeng"
+           << std::setw(10) << "Volume"     << "  "
+           << std::setw(10) << "Process"    << G4endl;             
 
     G4cout << std::setw(5) << fTrack->GetCurrentStepNumber() << " "
-	<< std::setw(6) << G4BestUnit(fTrack->GetPosition().x(),"Length")
-	<< std::setw(6) << G4BestUnit(fTrack->GetPosition().y(),"Length")
-	<< std::setw(6) << G4BestUnit(fTrack->GetPosition().z(),"Length")
-	<< std::setw(6) << G4BestUnit(fTrack->GetKineticEnergy(),"Energy")
-	<< std::setw(6) << G4BestUnit(fStep->GetTotalEnergyDeposit(),"Energy")
-	<< std::setw(6) << G4BestUnit(fStep->GetStepLength(),"Length")
-	<< std::setw(6) << G4BestUnit(fTrack->GetTrackLength(),"Length")
-	<< "  ";
+        << std::setw(6) << G4BestUnit(fTrack->GetPosition().x(),"Length")
+        << std::setw(6) << G4BestUnit(fTrack->GetPosition().y(),"Length")
+        << std::setw(6) << G4BestUnit(fTrack->GetPosition().z(),"Length")
+        << std::setw(6) << G4BestUnit(fTrack->GetKineticEnergy(),"Energy")
+        << std::setw(6) << G4BestUnit(fStep->GetTotalEnergyDeposit(),"Energy")
+        << std::setw(6) << G4BestUnit(fStep->GetStepLength(),"Length")
+        << std::setw(6) << G4BestUnit(fTrack->GetTrackLength(),"Length")
+        << "  ";
 
     if(fTrack->GetNextVolume()){
       G4cout << std::setw(10) << fTrack->GetVolume()->GetName();

examples/novice/N04/src/ExN04TrackerParametrisation.cc

@@ -29,6 +29,7 @@
 #include "G4VPhysicalVolume.hh"
 #include "G4ThreeVector.hh"
 #include "G4Tubs.hh"
+#include "G4SystemOfUnits.hh"
 
 ExN04TrackerParametrisation::ExN04TrackerParametrisation()
 {