Changeset 1230 for trunk/examples/advanced/gammaray_telescope/src

Timestamp:

Jan 8, 2010, 3:02:48 PM (15 years ago)

Author:

garnier

Message:

update to geant4.9.3

Location:

trunk/examples/advanced/gammaray_telescope/src

Files:

• GammaRayTelAnalysis.cc (modified) (1 diff)
• GammaRayTelAnalysisMessenger.cc (modified) (1 diff)
• GammaRayTelAnticoincidenceHit.cc (modified) (1 diff)
• GammaRayTelAnticoincidenceSD.cc (modified) (1 diff)
• GammaRayTelCalorimeterHit.cc (modified) (1 diff)
• GammaRayTelCalorimeterSD.cc (modified) (1 diff)
• GammaRayTelDetectorConstruction.cc (modified) (1 diff)
• GammaRayTelDetectorMessenger.cc (modified) (1 diff)
• GammaRayTelDigi.cc (modified) (1 diff)
• GammaRayTelDigitizer.cc (modified) (1 diff)
• GammaRayTelDigitizerMessenger.cc (modified) (1 diff)
• GammaRayTelEventAction.cc (modified) (1 diff)
• GammaRayTelHadronPhysics.cc (modified) (1 diff)
• GammaRayTelIonPhysics.cc (modified) (1 diff)
• GammaRayTelMuonPhysics.cc (modified) (2 diffs)
• GammaRayTelPhysicsList.cc (modified) (5 diffs)
• GammaRayTelPrimaryGeneratorAction.cc (modified) (2 diffs)
• GammaRayTelPrimaryGeneratorMessenger.cc (modified) (1 diff)
• GammaRayTelRunAction.cc (modified) (1 diff)
• GammaRayTelTrackerHit.cc (modified) (1 diff)
• GammaRayTelTrackerROGeometry.cc (modified) (1 diff)
• GammaRayTelTrackerSD.cc (modified) (4 diffs)

trunk/examples/advanced/gammaray_telescope/src/GammaRayTelAnalysis.cc

@@ -27 +27 @@
 //
 // $Id: GammaRayTelAnalysis.cc,v 1.21 2006/06/29 15:56:07 gunter Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 // ------------------------------------------------------------
 //      GEANT 4 class implementation file

trunk/examples/advanced/gammaray_telescope/src/GammaRayTelAnalysisMessenger.cc

@@ -26 +26 @@
 //
 // $Id: GammaRayTelAnalysisMessenger.cc,v 1.9 2006/06/29 15:56:10 gunter Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //
 // ------------------------------------------------------------

trunk/examples/advanced/gammaray_telescope/src/GammaRayTelAnticoincidenceHit.cc

@@ -26 +26 @@
 //
 // $Id: GammaRayTelAnticoincidenceHit.cc,v 1.4 2006/06/29 15:56:12 gunter Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 // ------------------------------------------------------------
 //      GEANT 4 class implementation file

trunk/examples/advanced/gammaray_telescope/src/GammaRayTelAnticoincidenceSD.cc

@@ -26 +26 @@
 //
 // $Id: GammaRayTelAnticoincidenceSD.cc,v 1.6 2006/06/29 15:56:15 gunter Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 // ------------------------------------------------------------
 //      GEANT 4 class implementation file

trunk/examples/advanced/gammaray_telescope/src/GammaRayTelCalorimeterHit.cc

@@ -26 +26 @@
 //
 // $Id: GammaRayTelCalorimeterHit.cc,v 1.4 2006/06/29 15:56:17 gunter Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 // ------------------------------------------------------------
 //      GEANT 4 class implementation file

trunk/examples/advanced/gammaray_telescope/src/GammaRayTelCalorimeterSD.cc

@@ -26 +26 @@
 //
 // $Id: GammaRayTelCalorimeterSD.cc,v 1.7 2006/06/29 15:56:19 gunter Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 // ------------------------------------------------------------
 //      GEANT 4 class implementation file

trunk/examples/advanced/gammaray_telescope/src/GammaRayTelDetectorConstruction.cc

@@ -26 +26 @@
 //
 // $Id: GammaRayTelDetectorConstruction.cc,v 1.15 2006/06/29 15:56:22 gunter Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 // ------------------------------------------------------------
 //      GEANT 4 class implementation file

trunk/examples/advanced/gammaray_telescope/src/GammaRayTelDetectorMessenger.cc

@@ -26 +26 @@
 //
 // $Id: GammaRayTelDetectorMessenger.cc,v 1.8 2006/06/29 15:56:25 gunter Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //
 // ------------------------------------------------------------

trunk/examples/advanced/gammaray_telescope/src/GammaRayTelDigi.cc

@@ -26 +26 @@
 //
 // $Id: GammaRayTelDigi.cc,v 1.5 2006/06/29 15:56:28 gunter Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 // ------------------------------------------------------------
 //      GEANT 4 class implementation file

trunk/examples/advanced/gammaray_telescope/src/GammaRayTelDigitizer.cc

@@ -26 +26 @@
 //
 // $Id: GammaRayTelDigitizer.cc,v 1.6 2006/06/29 15:56:31 gunter Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 // ------------------------------------------------------------
 //      GEANT 4 class implementation file

trunk/examples/advanced/gammaray_telescope/src/GammaRayTelDigitizerMessenger.cc

@@ -26 +26 @@
 //
 // $Id: GammaRayTelDigitizerMessenger.cc,v 1.5 2006/06/29 15:56:34 gunter Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 // ------------------------------------------------------------
 //      GEANT 4 class implementation file

trunk/examples/advanced/gammaray_telescope/src/GammaRayTelEventAction.cc

@@ -26 +26 @@
 //
 // $Id: GammaRayTelEventAction.cc,v 1.19 2006/06/29 15:56:39 gunter Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 // ------------------------------------------------------------
 //      GEANT 4 class implementation file

trunk/examples/advanced/gammaray_telescope/src/GammaRayTelHadronPhysics.cc

@@ -26 +26 @@
 //
 // $Id: GammaRayTelHadronPhysics.cc,v 1.4 2006/06/29 15:56:45 gunter Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //
 

trunk/examples/advanced/gammaray_telescope/src/GammaRayTelIonPhysics.cc

@@ -26 +26 @@
 //
 // $Id: GammaRayTelIonPhysics.cc,v 1.4 2006/06/29 15:56:48 gunter Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //
 // 

trunk/examples/advanced/gammaray_telescope/src/GammaRayTelMuonPhysics.cc

@@ -25 +25 @@
 //
 //
-// $Id: GammaRayTelMuonPhysics.cc,v 1.4 2006/06/29 15:56:50 gunter Exp $
-// GEANT4 tag $Name:  $
-//
+// $Id: GammaRayTelMuonPhysics.cc,v 1.8 2008/11/24 15:10:47 cirrone Exp $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 // 
 
@@ -34 +33 @@
 #include "globals.hh"
 #include "G4ios.hh"
+#include "G4MuonPlus.hh"
+#include "G4TauPlus.hh"
+#include "G4TauMinus.hh"
 #include <iomanip>   
+
+
+#include "G4ParticleTypes.hh"
 
 

trunk/examples/advanced/gammaray_telescope/src/GammaRayTelPhysicsList.cc

@@ -25 +25 @@
 //
 //
-// $Id: GammaRayTelPhysicsList.cc,v 1.7 2006/06/29 15:56:55 gunter Exp $
-// GEANT4 tag $Name:  $
+// $Id: GammaRayTelPhysicsList.cc,v 1.8 2009/11/18 15:59:05 flongo Exp $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //
 // 
@@ -44 +44 @@
 #include "G4ios.hh"
 #include <iomanip>   
+
 #include "GammaRayTelParticles.hh"
 #include "GammaRayTelGeneralPhysics.hh"
-#include "GammaRayTelEMPhysics.hh"
+#include "GammaRayTelEMstdPhysics.hh"
+#include "GammaRayTelEMlowePhysics.hh"
 #include "GammaRayTelMuonPhysics.hh"
 #include "GammaRayTelHadronPhysics.hh"
 #include "GammaRayTelIonPhysics.hh"
 
+#include "G4PhysListFactory.hh"
+#include "G4VPhysicsConstructor.hh"
+#include "G4EmProcessOptions.hh"
+
+
+#include "GammaRayTelPhysicsListMessenger.hh"
+
 GammaRayTelPhysicsList::GammaRayTelPhysicsList():  G4VModularPhysicsList()
 {
@@ -57 +66 @@
   SetVerboseLevel(1);
 
+  pMessenger = new GammaRayTelPhysicsListMessenger(this);
+
+  // Particles
+
+ 
   RegisterPhysics( new GammaRayTelParticles("particles") );
 
+  G4cout << "PARTICLES DONE" << G4endl;
+
+  // EM physics
+
+  emPhysicsList = new GammaRayTelEMstdPhysics;
+  emName = G4String("Standard EM");
+
+
   // General Physics
+
   RegisterPhysics( new GammaRayTelGeneralPhysics("general") );
 
-  // EM Physics
-  RegisterPhysics( new GammaRayTelEMPhysics("electromagnetic"));
+  G4cout << "GENERAL DONE" << G4endl;
+
 
   // Muon Physics
+
   RegisterPhysics(  new GammaRayTelMuonPhysics("muon"));
+
+
+  G4cout << "MUON DONE" << G4endl;
 
    // Hadron Physics
   RegisterPhysics(  new GammaRayTelHadronPhysics("hadron"));
 
+  G4cout << "HADRONS DONE" << G4endl;
+
   // Ion Physics
   RegisterPhysics( new GammaRayTelIonPhysics("ion"));
 
 
+  G4cout << "IONS DONE" << G4endl;
+
 }
 
 GammaRayTelPhysicsList::~GammaRayTelPhysicsList()
 {
+  delete pMessenger;
+  delete emPhysicsList;
 }
 
@@ -94 +127 @@
   // These values are used as the default production thresholds
   // for the world volume.
+
+  G4cout << "CUT STD" << G4endl;
+
   SetCutsWithDefault();
 
- 
+
+}
+
+void GammaRayTelPhysicsList::SetRegionCut(G4double cutvalue)
+{
+
+ SetCutsWithDefault();
+
+  if (verboseLevel >0){
+    G4cout << "GammaRayTelPhysicsList::SetCuts: default cut length : "
+         << G4BestUnit(defaultCutValue,"Length") << G4endl;
+  }
+  
+  G4cout << "CUTS NEW" << G4endl;
+  
   // Production thresholds for detector regions
 
   G4String regName[] = {"Calorimeter","Tracker"};
-  G4double cutValue[] = {1*mm, 0.1*mm};
+  //  G4double cutValue[] = {1*mm, 0.1*mm};
+  G4double cutValue[] = {cutvalue, cutvalue/10.};
+
+
   
   for(G4int i=0;i<2;i++)
@@ -109 +162 @@
     reg->SetProductionCuts(cuts);
   }
-}
-
-
-
-
+
+}
+
+
+/////////////////////////////////////////////////////////////////////////////
+
+void GammaRayTelPhysicsList::AddPhysicsList(const G4String& name)
+{
+
+  if (verboseLevel>1) {
+    G4cout << "PhysicsList::AddPhysicsList: <" << name << ">" << G4endl;
+  }
+
+  if (name == "Standard EM") {
+
+    emName = name;
+    delete emPhysicsList;
+    emPhysicsList = new GammaRayTelEMstdPhysics();
+    G4cout << "THE FOLLOWING ELECTROMAGNETIC PHYSICS LIST HAS BEEN ACTIVATED: EM Standard" << G4endl;
+    
+  } else if (name == "LowE EM") {
+    emName = name;
+    delete emPhysicsList;
+    emPhysicsList = new GammaRayTelEMlowePhysics();;
+     G4cout << "THE FOLLOWING ELECTROMAGNETIC PHYSICS LIST HAS BEEN ACTIVATED: EM LowE" << G4endl;
+  } 
+  else {
+    G4cout << "PhysicsList::AddPhysicsList: <" << name << ">"
+           << " is not defined"
+           << G4endl;
+  }
+
+
+  G4cout << "REGISTRATION DONE " << G4endl;
+
+    RegisterPhysics(emPhysicsList);
+
+}

trunk/examples/advanced/gammaray_telescope/src/GammaRayTelPrimaryGeneratorAction.cc

@@ -25 +25 @@
 //
 //
-// $Id: GammaRayTelPrimaryGeneratorAction.cc,v 1.10 2006/06/29 15:56:58 gunter Exp $
-// GEANT4 tag $Name: geant4-09-01-patch-02 $
+// $Id: GammaRayTelPrimaryGeneratorAction.cc,v 1.11 2007/11/09 16:33:34 flongo Exp $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 // ------------------------------------------------------------
 //      GEANT 4 class implementation file
@@ -69 +69 @@
   G4int n_particle = 1;
 
-  if (sourceGun)
-    {
-      particleGun  = new G4ParticleGun(n_particle);     
+  particleGun  = new G4ParticleGun(n_particle);     
       // default particle kinematic
-      
-      G4ParticleTable* particleTable = G4ParticleTable::GetParticleTable();
-      G4String particleName;
-      G4ParticleDefinition* particle
-        = particleTable->FindParticle(particleName="e-");
-      particleGun->SetParticleDefinition(particle);
-      particleGun->SetParticleMomentumDirection(G4ThreeVector(0.,0.,-1.));
-      particleGun->SetParticleEnergy(30.*MeV);
-      G4double position = 0.5*(GammaRayTelDetector->GetWorldSizeZ());
-      particleGun->SetParticlePosition(G4ThreeVector(0.*cm,0.*cm,position));
-    }
-  else
-    {
-      particleSource = new G4GeneralParticleSource();
-    }
   
+  G4ParticleTable* particleTable = G4ParticleTable::GetParticleTable();
+  G4String particleName;
+  G4ParticleDefinition* particle
+    = particleTable->FindParticle(particleName="e-");
+  particleGun->SetParticleDefinition(particle);
+  particleGun->SetParticleMomentumDirection(G4ThreeVector(0.,0.,-1.));
+  particleGun->SetParticleEnergy(30.*MeV);
+  G4double position = 0.5*(GammaRayTelDetector->GetWorldSizeZ());
+  particleGun->SetParticlePosition(G4ThreeVector(0.*cm,0.*cm,position));
+  particleSource = new G4GeneralParticleSource();
+   
 }
 

trunk/examples/advanced/gammaray_telescope/src/GammaRayTelPrimaryGeneratorMessenger.cc

@@ -26 +26 @@
 //
 // $Id: GammaRayTelPrimaryGeneratorMessenger.cc,v 1.8 2006/06/29 15:57:01 gunter Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 // ------------------------------------------------------------
 //      GEANT 4 class implementation file

trunk/examples/advanced/gammaray_telescope/src/GammaRayTelRunAction.cc

@@ -26 +26 @@
 //
 // $Id: GammaRayTelRunAction.cc,v 1.11 2006/06/29 15:57:04 gunter Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 // ------------------------------------------------------------
 //      GEANT 4 class implementation file

trunk/examples/advanced/gammaray_telescope/src/GammaRayTelTrackerHit.cc

@@ -26 +26 @@
 //
 // $Id: GammaRayTelTrackerHit.cc,v 1.4 2006/06/29 15:57:07 gunter Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 // ------------------------------------------------------------
 //      GEANT 4 class implementation file

trunk/examples/advanced/gammaray_telescope/src/GammaRayTelTrackerROGeometry.cc

@@ -26 +26 @@
 //
 // $Id: GammaRayTelTrackerROGeometry.cc,v 1.6 2006/06/29 15:57:10 gunter Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //
 // 

trunk/examples/advanced/gammaray_telescope/src/GammaRayTelTrackerSD.cc

@@ -25 +25 @@
 //
 //
-// $Id: GammaRayTelTrackerSD.cc,v 1.9 2006/06/29 15:57:13 gunter Exp $
-// GEANT4 tag $Name: geant4-09-01-patch-02 $
 // ------------------------------------------------------------
 //      GEANT 4 class implementation file
@@ -97 +95 @@
 G4bool GammaRayTelTrackerSD::ProcessHits(G4Step* aStep,G4TouchableHistory* ROhist)
 { 
-
+   
   G4double edep = aStep->GetTotalEnergyDeposit();
   if ((edep/keV == 0.)) return false;      
@@ -103 +101 @@
   G4int StripTotal = Detector->GetNbOfTKRStrips();
   G4int TileTotal  = Detector->GetNbOfTKRTiles();  
-  
+
   // This TouchableHistory is used to obtain the physical volume
   // of the hit
@@ -123 +121 @@
   G4VPhysicalVolume* strip = 0;
   strip = ROhist->GetVolume();
-  G4String StripName = strip->GetName();
-  StripNumber= strip->GetCopyNo();  
-
-  ROhist->MoveUpHistory();
-  G4VPhysicalVolume* tile = ROhist->GetVolume(); 
+
+  //  if (strip){
+    G4String StripName = strip->GetName();
+    StripNumber= strip->GetCopyNo();  
+    //  }
+  //  ROhist->MoveUpHistory();
+  G4VPhysicalVolume* tile = ROhist->GetVolume(1); 
   G4int TileNumber = tile->GetCopyNo();  
   G4String TileName = tile->GetName();