Import Geant4 1.1.0 source tree

examples/novice/N04/exampleN04.EMtest.in

@@ -1,5 +1,8 @@
 /mydet/generator particleGun
 /mydet/reqmuon 1
 /mydet/isomuon 1
-/run/beamOn 10
+/run/beamOn 1
+/gun/particle mu-
+/gun/energy 10 TeV
+/run/beamOn 2
 exit

examples/novice/N04/exampleN04.EMtest.large_N.in

@@ -0,0 +1,8 @@
+/mydet/generator particleGun
+/mydet/reqmuon 1
+/mydet/isomuon 1
+/run/beamOn 1
+/gun/particle mu-
+/gun/energy 10 TeV
+/run/beamOn 20
+exit

examples/novice/N04/exampleN04.EMtest.out

@@ -1,5 +1,5 @@
 **********************************************
- Geant4 version $Name: geant4-01-00 $
+ Geant4 version $Name: geant4-01-01 $
                                   (07-Dec-99)
              Copyright : Geant4 Collaboration
 **********************************************
@@ -65,74 +65,24 @@ MuBrems:  theoretical cross section
 MuPairProd:  theoretical cross sections 
           Good description up to 1000 TeV.
     PhysicsTables from 1 GeV to 1000 PeV in 50 bins. 
-Idle> Idle> Idle> Idle> Stage 0->1 : 1 hits found in the muon chamber.
+Stage 0->1 : 1 hits found in the muon chamber.
 Stage 1->2 : 1 isolated muon found.
 >>> Event 0
      25 hits are stored in ExN04TrackerHitsCollection.
-     4 hits are stored in ExN04CalorimeterHitsCollection.
-     Total energy deposition in calorimeter : 0.286949 (GeV)
+     9 hits are stored in ExN04CalorimeterHitsCollection.
+     Total energy deposition in calorimeter : 2.53644 (GeV)
+     1 hits are stored in ExN04MuonHitsCollection.
+Stage 0->1 : 1 hits found in the muon chamber.
+Stage 1->2 : 1 isolated muon found.
+>>> Event 0
+     5 hits are stored in ExN04TrackerHitsCollection.
+     13 hits are stored in ExN04CalorimeterHitsCollection.
+     Total energy deposition in calorimeter : 3.83715 (GeV)
      1 hits are stored in ExN04MuonHitsCollection.
 Stage 0->1 : 1 hits found in the muon chamber.
 Stage 1->2 : 1 isolated muon found.
 >>> Event 1
-     5 hits are stored in ExN04TrackerHitsCollection.
-     4 hits are stored in ExN04CalorimeterHitsCollection.
-     Total energy deposition in calorimeter : 0.228803 (GeV)
+     27 hits are stored in ExN04TrackerHitsCollection.
+     23 hits are stored in ExN04CalorimeterHitsCollection.
+     Total energy deposition in calorimeter : 27.0965 (GeV)
      1 hits are stored in ExN04MuonHitsCollection.
-Stage 0->1 : 1 hits found in the muon chamber.
-Stage 1->2 : 1 isolated muon found.
->>> Event 2
-     5 hits are stored in ExN04TrackerHitsCollection.
-     4 hits are stored in ExN04CalorimeterHitsCollection.
-     Total energy deposition in calorimeter : 0.228142 (GeV)
-     1 hits are stored in ExN04MuonHitsCollection.
-Stage 0->1 : 1 hits found in the muon chamber.
-Stage 1->2 : 1 isolated muon found.
->>> Event 3
-     17 hits are stored in ExN04TrackerHitsCollection.
-     5 hits are stored in ExN04CalorimeterHitsCollection.
-     Total energy deposition in calorimeter : 0.268653 (GeV)
-     1 hits are stored in ExN04MuonHitsCollection.
-Stage 0->1 : 1 hits found in the muon chamber.
-Stage 1->2 : 1 isolated muon found.
->>> Event 4
-     24 hits are stored in ExN04TrackerHitsCollection.
-     4 hits are stored in ExN04CalorimeterHitsCollection.
-     Total energy deposition in calorimeter : 0.316491 (GeV)
-     1 hits are stored in ExN04MuonHitsCollection.
-Stage 0->1 : 1 hits found in the muon chamber.
-Stage 1->2 : 1 isolated muon found.
->>> Event 5
-     18 hits are stored in ExN04TrackerHitsCollection.
-     4 hits are stored in ExN04CalorimeterHitsCollection.
-     Total energy deposition in calorimeter : 0.301362 (GeV)
-     1 hits are stored in ExN04MuonHitsCollection.
-Stage 0->1 : 1 hits found in the muon chamber.
-Stage 1->2 : 1 isolated muon found.
->>> Event 6
-     15 hits are stored in ExN04TrackerHitsCollection.
-     5 hits are stored in ExN04CalorimeterHitsCollection.
-     Total energy deposition in calorimeter : 0.215446 (GeV)
-     1 hits are stored in ExN04MuonHitsCollection.
-Stage 0->1 : 1 hits found in the muon chamber.
-Stage 1->2 : 1 isolated muon found.
->>> Event 7
-     10 hits are stored in ExN04TrackerHitsCollection.
-     4 hits are stored in ExN04CalorimeterHitsCollection.
-     Total energy deposition in calorimeter : 0.324704 (GeV)
-     1 hits are stored in ExN04MuonHitsCollection.
-Stage 0->1 : 1 hits found in the muon chamber.
-Stage 1->2 : 1 isolated muon found.
->>> Event 8
-     16 hits are stored in ExN04TrackerHitsCollection.
-     4 hits are stored in ExN04CalorimeterHitsCollection.
-     Total energy deposition in calorimeter : 0.472503 (GeV)
-     1 hits are stored in ExN04MuonHitsCollection.
-Stage 0->1 : 1 hits found in the muon chamber.
-Stage 1->2 : 1 isolated muon found.
->>> Event 9
-     5 hits are stored in ExN04TrackerHitsCollection.
-     7 hits are stored in ExN04CalorimeterHitsCollection.
-     Total energy deposition in calorimeter : 0.381889 (GeV)
-     1 hits are stored in ExN04MuonHitsCollection.
-Idle> 

examples/novice/N04/exampleN04.cc

@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: exampleN04.cc,v 1.1.10.1 1999/12/07 20:47:32 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: exampleN04.cc,v 1.2 1999/12/15 14:49:26 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // --------------------------------------------------------------

examples/novice/N04/exampleN04.out

@@ -1,5 +1,5 @@
 **********************************************
- Geant4 version $Name: geant4-01-00 $
+ Geant4 version $Name: geant4-01-01 $
                                   (07-Dec-99)
              Copyright : Geant4 Collaboration
 **********************************************
@@ -65,13 +65,13 @@ MuBrems:  theoretical cross section
 MuPairProd:  theoretical cross sections 
           Good description up to 1000 TeV.
     PhysicsTables from 1 GeV to 1000 PeV in 50 bins. 
-Idle> #
-Idle> Idle> Idle> Idle> Stage 0->1 : 1 hits found in the muon chamber.
+#
+Stage 0->1 : 1 hits found in the muon chamber.
 Stage 1->2 : 1 isolated muon found.
 >>> Event 0
-     156 hits are stored in ExN04TrackerHitsCollection.
-     55 hits are stored in ExN04CalorimeterHitsCollection.
-     Total energy deposition in calorimeter : 0.810364 (GeV)
+     121 hits are stored in ExN04TrackerHitsCollection.
+     59 hits are stored in ExN04CalorimeterHitsCollection.
+     Total energy deposition in calorimeter : 0.706765 (GeV)
      1 hits are stored in ExN04MuonHitsCollection.
 Stage 0->1 : 0 hits found in the muon chamber.
 ++++++++ event aborted
@@ -81,11 +81,11 @@ Stage 0->1 : 0 hits found in the muon chamber.
      Total energy deposition in calorimeter : 0 (GeV)
      0 hits are stored in ExN04MuonHitsCollection.
 Stage 0->1 : 1 hits found in the muon chamber.
-Stage 1->2 : 1 isolated muon found.
+Stage 1->2 : 0 isolated muon found.
+++++++++ event aborted
 >>> Event 2
-     89 hits are stored in ExN04TrackerHitsCollection.
-     53 hits are stored in ExN04CalorimeterHitsCollection.
-     Total energy deposition in calorimeter : 0.969477 (GeV)
+     82 hits are stored in ExN04TrackerHitsCollection.
+     13 hits are stored in ExN04CalorimeterHitsCollection.
+     Total energy deposition in calorimeter : 0.3424 (GeV)
      1 hits are stored in ExN04MuonHitsCollection.
-Idle> #
-Idle> 
+#

examples/novice/N04/src/ExN04CalorimeterSD.cc

@@ -58,14 +58,14 @@ G4bool ExN04CalorimeterSD::ProcessHits(G4Step*aStep,G4TouchableHistory*ROhist)
     CellID[copyIDinZ][copyIDinPhi] = icell - 1;
     if(verboseLevel>0)
     { G4cout << " New Calorimeter Hit on CellID " 
-           << copyIDinZ << " " << copyIDinPhi << endl; }
+           << copyIDinZ << " " << copyIDinPhi << G4endl; }
   }
   else
   { 
     (*CalCollection)[CellID[copyIDinZ][copyIDinPhi]]->AddEdep(edep);
     if(verboseLevel>0)
     { G4cout << " Energy added to CellID " 
-           << copyIDinZ << " " << copyIDinPhi << endl; }
+           << copyIDinZ << " " << copyIDinPhi << G4endl; }
   }
 
   return true;

examples/novice/N04/src/ExN04EventAction.cc

@@ -45,7 +45,7 @@ void ExN04EventAction::BeginOfEventAction(const G4Event*)
 
 void ExN04EventAction::EndOfEventAction(const G4Event* evt)
 {
-  G4cout << ">>> Event " << evt->GetEventID() << endl;
+  G4cout << ">>> Event " << evt->GetEventID() << G4endl;
 
   if(trackerCollID<0||calorimeterCollID<0||muonCollID<0) return;
 
@@ -64,24 +64,24 @@ void ExN04EventAction::EndOfEventAction(const G4Event* evt)
   {
     int n_hit = THC->entries();
     G4cout << "     " << n_hit
-         << " hits are stored in ExN04TrackerHitsCollection." << endl;
+         << " hits are stored in ExN04TrackerHitsCollection." << G4endl;
   }
   if(CHC)
   {
     int n_hit = CHC->entries();
     G4cout << "     " << n_hit
-         << " hits are stored in ExN04CalorimeterHitsCollection." << endl;
+         << " hits are stored in ExN04CalorimeterHitsCollection." << G4endl;
     G4double totE = 0;
     for(int i=0;i<n_hit;i++)
     { totE += (*CHC)[i]->GetEdep(); }
     G4cout << "     Total energy deposition in calorimeter : "
-         << totE / GeV << " (GeV)" << endl;
+         << totE / GeV << " (GeV)" << G4endl;
   }
   if(MHC)
   {
     int n_hit = MHC->entries();
     G4cout << "     " << n_hit
-         << " hits are stored in ExN04MuonHitsCollection." << endl;
+         << " hits are stored in ExN04MuonHitsCollection." << G4endl;
   }
 
   G4VVisManager* pVVisManager = G4VVisManager::GetConcreteInstance();

examples/novice/N04/src/ExN04PhysicsList.cc

@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: ExN04PhysicsList.cc,v 1.6.6.1 1999/12/07 20:47:32 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: ExN04PhysicsList.cc,v 1.7 1999/12/15 14:49:26 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 
@@ -28,7 +28,7 @@
 #include "G4Material.hh"
 #include "G4MaterialTable.hh"
 #include "G4ios.hh"
-#include <iomanip.h>   
+#include "g4std/iomanip"   
 
 #include "G4FastSimulationManagerProcess.hh"
 

examples/novice/N04/src/ExN04StackingAction.cc

@@ -70,7 +70,7 @@ G4bool ExN04StackingAction::InsideRoI(const G4Track * aTrack,G4double ang)
   if(!muonHits)
   { muonHits = (ExN04MuonHitsCollection*)GetCollection("muonCollection"); }
   if(!muonHits)
-  { G4cerr << "muonCollection NOT FOUND" << endl;
+  { G4cerr << "muonCollection NOT FOUND" << G4endl;
     return true; }
 
   G4int nhits = muonHits->entries();
@@ -111,15 +111,15 @@ void ExN04StackingAction::NewStage()
     if(!muonHits)
     { muonHits = (ExN04MuonHitsCollection*)GetCollection("muonCollection"); }
     if(!muonHits)
-    { G4cerr << "muonCollection NOT FOUND" << endl;
+    { G4cerr << "muonCollection NOT FOUND" << G4endl;
       return; }
     nhits = muonHits->entries();
     G4cout << "Stage 0->1 : " << nhits << " hits found in the muon chamber."
-         << endl;
+         << G4endl;
     if(nhits<reqMuon)
     { 
       stackManager->clear();
-      G4cout << "++++++++ event aborted" << endl;
+      G4cout << "++++++++ event aborted" << G4endl;
       return;
     }
     stackManager->ReClassify();
@@ -138,7 +138,7 @@ void ExN04StackingAction::NewStage()
     if(!trkHits)
     { trkHits = (ExN04TrackerHitsCollection*)GetCollection("trackerCollection"); }
     if(!trkHits)
-    { G4cerr << "trackerCollection NOT FOUND" << endl;
+    { G4cerr << "trackerCollection NOT FOUND" << G4endl;
       return; }
     G4int nTrkhits = trkHits->entries();
     G4int isoMuon = 0;
@@ -153,11 +153,11 @@ void ExN04StackingAction::NewStage()
       }
       if(nhitIn<=reqIso) isoMuon++;
     }
-    G4cout << "Stage 1->2 : " << isoMuon << " isolated muon found." << endl;
+    G4cout << "Stage 1->2 : " << isoMuon << " isolated muon found." << G4endl;
     if(isoMuon<reqIsoMuon)
     {
       stackManager->clear();
-      G4cout << "++++++++ event aborted" << endl;
+      G4cout << "++++++++ event aborted" << G4endl;
       return;
     }
     stackManager->ReClassify();