Changeset 1337 for trunk/examples/extended/electromagnetic/TestEm8/src

Timestamp:

Sep 30, 2010, 2:47:17 PM (14 years ago)

Author:

garnier

Message:

tag geant4.9.4 beta 1 + modifs locales

Location:

trunk/examples/extended/electromagnetic/TestEm8/src

Files:

• Em8CalorHit.cc (modified) (1 diff)
• Em8CalorimeterSD.cc (modified) (1 diff)
• Em8DetectorConstruction.cc (modified) (4 diffs)
• Em8DetectorMessenger.cc (modified) (1 diff)
• Em8EventAction.cc (modified) (3 diffs)
• Em8EventActionMessenger.cc (modified) (1 diff)
• Em8PrimaryGeneratorAction.cc (modified) (1 diff)
• Em8PrimaryGeneratorMessenger.cc (modified) (1 diff)
• Em8RunAction.cc (modified) (1 diff)
• Em8RunMessenger.cc (modified) (1 diff)
• Em8SteppingAction.cc (modified) (1 diff)
• Em8SteppingVerbose.cc (modified) (1 diff)
• PhysicsList.cc (modified) (6 diffs)
• PhysicsListMessenger.cc (modified) (1 diff)
• StepMax.cc (modified) (1 diff)
• StepMaxMessenger.cc (modified) (1 diff)

trunk/examples/extended/electromagnetic/TestEm8/src/Em8CalorHit.cc

@@ -26 +26 @@
 //
 // $Id: Em8CalorHit.cc,v 1.5 2006/06/29 17:00:03 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-04-beta-01 $
 //
 // 

trunk/examples/extended/electromagnetic/TestEm8/src/Em8CalorimeterSD.cc

@@ -26 +26 @@
 //
 // $Id: Em8CalorimeterSD.cc,v 1.7 2006/06/29 17:00:05 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-04-beta-01 $
 //
 // 

trunk/examples/extended/electromagnetic/TestEm8/src/Em8DetectorConstruction.cc

@@ -25 +25 @@
 //
 //
-// $Id: Em8DetectorConstruction.cc,v 1.21 2007/10/02 10:12:47 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// $Id: Em8DetectorConstruction.cc,v 1.23 2010/06/04 17:08:15 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-04-beta-01 $
 //
 // 
@@ -149 +149 @@
   a = 26.98*g/mole;
   density = 2.7*g/cm3;
-  G4Material* Al = new G4Material(name="Aluminium", z=13., a, density);
-  if(Al);
+  new G4Material(name="Aluminium", z=13., a, density);
 
   // Mylar
@@ -162 +161 @@
   density = 2.330*g/cm3;
   a = 28.09*g/mole;
-  G4Material* Si = new G4Material(name="Silicon", z=14., a, density);
-  if(Si);
+  new G4Material(name="Silicon", z=14., a, density);
 
   // Krypton as detector gas, STP
@@ -367 +365 @@
   if( fRegGasDet == 0 ) // First time - instantiate a region and a cut objects
   {    
-    fRegGasDet = new G4Region("VertexDetector");
+    fRegGasDet = new G4Region("GasDetector");
     cuts = new G4ProductionCuts();
     fRegGasDet->SetProductionCuts(cuts);

trunk/examples/extended/electromagnetic/TestEm8/src/Em8DetectorMessenger.cc

@@ -26 +26 @@
 //
 // $Id: Em8DetectorMessenger.cc,v 1.8 2007/10/02 10:12:47 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-04-beta-01 $
 //
 // 

trunk/examples/extended/electromagnetic/TestEm8/src/Em8EventAction.cc

@@ -25 +25 @@
 //
 //
-// $Id: Em8EventAction.cc,v 1.10 2007/11/12 10:54:49 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// $Id: Em8EventAction.cc,v 1.11 2010/06/06 04:31:28 perl Exp $
+// GEANT4 tag $Name: geant4-09-04-beta-01 $
 //
 // 
@@ -45 +45 @@
 #include "G4SDManager.hh"
 #include "G4UImanager.hh"
-#include "G4TrajectoryContainer.hh"
-#include "G4Trajectory.hh"
-#include "G4VVisManager.hh"
 #include "G4ios.hh"
 #include "G4UnitsTable.hh"
@@ -142 +139 @@
     runaction->FillNbOfSteps(nstep);
   }
-  
-  G4VVisManager* pVVisManager = G4VVisManager::GetConcreteInstance();
-
-  if(pVVisManager)
-  {
-   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]);
-        if (drawFlag == "all") trj->DrawTrajectory(50);
-        else if ((drawFlag == "charged")&&(trj->GetCharge() != 0.))
-                               trj->DrawTrajectory(50); 
-      }
-  }  
 
   if(verboselevel>0)

trunk/examples/extended/electromagnetic/TestEm8/src/Em8EventActionMessenger.cc

@@ -26 +26 @@
 //
 // $Id: Em8EventActionMessenger.cc,v 1.5 2006/06/29 17:00:15 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-04-beta-01 $
 //
 // 

trunk/examples/extended/electromagnetic/TestEm8/src/Em8PrimaryGeneratorAction.cc

@@ -26 +26 @@
 //
 // $Id: Em8PrimaryGeneratorAction.cc,v 1.7 2006/06/29 17:00:18 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-04-beta-01 $
 //
 // 

trunk/examples/extended/electromagnetic/TestEm8/src/Em8PrimaryGeneratorMessenger.cc

@@ -26 +26 @@
 //
 // $Id: Em8PrimaryGeneratorMessenger.cc,v 1.5 2006/06/29 17:00:21 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-04-beta-01 $
 //
 // 

trunk/examples/extended/electromagnetic/TestEm8/src/Em8RunAction.cc

@@ -26 +26 @@
 //
 // $Id: Em8RunAction.cc,v 1.15 2007/11/12 10:54:49 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-04-beta-01 $
 //
 // 

trunk/examples/extended/electromagnetic/TestEm8/src/Em8RunMessenger.cc

@@ -26 +26 @@
 //
 // $Id: Em8RunMessenger.cc,v 1.7 2006/06/29 17:00:25 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-04-beta-01 $
 //
 // 

trunk/examples/extended/electromagnetic/TestEm8/src/Em8SteppingAction.cc

@@ -26 +26 @@
 //
 // $Id: Em8SteppingAction.cc,v 1.10 2007/11/12 10:54:49 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-04-beta-01 $
 //
 // 

trunk/examples/extended/electromagnetic/TestEm8/src/Em8SteppingVerbose.cc

@@ -26 +26 @@
 //
 // $Id: Em8SteppingVerbose.cc,v 1.8 2006/06/29 17:00:29 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-04-beta-01 $
 //
 //

trunk/examples/extended/electromagnetic/TestEm8/src/PhysicsList.cc

@@ -25 +25 @@
 //
 //
-// $Id: PhysicsList.cc,v 1.16 2008/12/05 17:46:12 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// $Id: PhysicsList.cc,v 1.19 2010/06/04 17:08:15 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-04-beta-01 $
 //
 
@@ -61 +61 @@
 PhysicsList::PhysicsList() : G4VModularPhysicsList()
 {
-  G4LossTableManager::Instance();
+  em_config = G4LossTableManager::Instance()->EmConfigurator();
+  G4LossTableManager::Instance()->SetVerbose(1);
   defaultCutValue = 1.*mm;
   cutForGamma     = defaultCutValue;
@@ -88 +89 @@
   delete generalPhysicsList;
   delete emPhysicsList;
-  for(size_t i=0; i<hadronPhys.size(); i++) delete hadronPhys[i];
+  for(size_t i=0; i<hadronPhys.size(); ++i) { delete hadronPhys[i]; }
   delete stepMaxProcess;
 }
@@ -105 +106 @@
   AddTransportation();
   emPhysicsList->ConstructProcess();
-  em_config.AddModels();
   generalPhysicsList->ConstructProcess();
-  for(size_t i=0; i<hadronPhys.size(); i++) hadronPhys[i]->ConstructProcess();
+  for(size_t i=0; i<hadronPhys.size(); ++i) { hadronPhys[i]->ConstructProcess(); }
   AddStepMax();
 }
@@ -196 +196 @@
   SetCutValue(cutForPositron, "e+");
 
-  if ( verboseLevel > 0 ) DumpCutValuesTable();
+  if ( verboseLevel > 0 ) { DumpCutValuesTable(); }
 }
 
@@ -256 +256 @@
   if(modname == "pai") {
     G4PAIModel* pai = new G4PAIModel(part,"PAIModel");
-    em_config.SetExtraEmModel(partname,procname,pai,"VertexDetector",
+    em_config->SetExtraEmModel(partname,procname,pai,"GasDetector",
                               0.0,100.*TeV,pai);
   } else if(modname == "pai_photon") {
     G4PAIPhotonModel* pai = new G4PAIPhotonModel(part,"PAIPhotModel");
-    em_config.SetExtraEmModel(partname,procname,pai,"VertexDetector",
+    em_config->SetExtraEmModel(partname,procname,pai,"GasDetector",
                               0.0,100.*TeV,pai);
   }

trunk/examples/extended/electromagnetic/TestEm8/src/PhysicsListMessenger.cc

@@ -26 +26 @@
 //
 // $Id: PhysicsListMessenger.cc,v 1.2 2006/06/29 17:00:47 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-04-beta-01 $
 //
 // 

trunk/examples/extended/electromagnetic/TestEm8/src/StepMax.cc

@@ -25 +25 @@
 //
 // $Id: StepMax.cc,v 1.3 2006/06/29 17:00:49 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-04-beta-01 $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

trunk/examples/extended/electromagnetic/TestEm8/src/StepMaxMessenger.cc

@@ -25 +25 @@
 //
 // $Id: StepMaxMessenger.cc,v 1.2 2006/06/29 17:00:52 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-04-beta-01 $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......