Changeset 1337 for trunk/examples/extended/electromagnetic/TestEm2/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/TestEm2/src

Files:

• DetectorConstruction.cc (modified) (1 diff)
• DetectorMessenger.cc (modified) (1 diff)
• EmAcceptance.cc (modified) (1 diff)
• EventAction.cc (modified) (3 diffs)
• EventActionMessenger.cc (modified) (1 diff)
• PhysListEmStandard.cc (modified) (1 diff)
• PhysicsList.cc (modified) (1 diff)
• PhysicsListMessenger.cc (modified) (1 diff)
• PrimaryGeneratorAction.cc (modified) (1 diff)
• RunAction.cc (modified) (4 diffs)
• RunActionMessenger.cc (modified) (1 diff)
• StepMax.cc (modified) (1 diff)
• StepMaxMessenger.cc (modified) (1 diff)
• SteppingAction.cc (modified) (1 diff)
• SteppingVerbose.cc (modified) (1 diff)
• TrackingAction.cc (modified) (1 diff)

trunk/examples/extended/electromagnetic/TestEm2/src/DetectorConstruction.cc

@@ -26 +26 @@
 // 
 // $Id: DetectorConstruction.cc,v 1.14 2009/09/16 18:07:30 maire 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/TestEm2/src/DetectorMessenger.cc

@@ -25 +25 @@
 //
 // $Id: DetectorMessenger.cc,v 1.8 2006/06/29 16:50:20 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/TestEm2/src/EmAcceptance.cc

@@ -25 +25 @@
 //
 // $Id: EmAcceptance.cc,v 1.5 2006/06/29 16:50:22 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/TestEm2/src/EventAction.cc

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: EventAction.cc,v 1.3 2006/06/29 16:50:24 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// $Id: EventAction.cc,v 1.5 2010/06/07 05:40:46 perl Exp $
+// GEANT4 tag $Name: geant4-09-04-beta-01 $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
@@ -35 +35 @@
 #include "RunAction.hh"
 #include "G4Event.hh"
-#include "G4TrajectoryContainer.hh"
-#include "G4Trajectory.hh"
-#include "G4VVisManager.hh"
 #include "G4UnitsTable.hh"
 
@@ -71 +68 @@
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 
-void EventAction::EndOfEventAction(const G4Event* evt)
+void EventAction::EndOfEventAction(const G4Event*)
 {  
   Run->fillPerEvent();  
-    
-  if (G4VVisManager::GetConcreteInstance())
-    {                         
-     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); 
-        }
-  }
 }
 

trunk/examples/extended/electromagnetic/TestEm2/src/EventActionMessenger.cc

@@ -26 +26 @@
 //
 // $Id: EventActionMessenger.cc,v 1.3 2006/06/29 16:50:26 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-04-beta-01 $
 //
 // 

trunk/examples/extended/electromagnetic/TestEm2/src/PhysListEmStandard.cc

@@ -26 +26 @@
 //
 // $Id: PhysListEmStandard.cc,v 1.13 2009/11/13 16:01:10 maire 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/TestEm2/src/PhysicsList.cc

@@ -25 +25 @@
 //
 // $Id: PhysicsList.cc,v 1.16 2009/09/16 18:07:30 maire 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/TestEm2/src/PhysicsListMessenger.cc

@@ -25 +25 @@
 //
 // $Id: PhysicsListMessenger.cc,v 1.5 2006/06/29 16:50:41 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/TestEm2/src/PrimaryGeneratorAction.cc

@@ -25 +25 @@
 //
 // $Id: PrimaryGeneratorAction.cc,v 1.6 2006/06/29 16:50:44 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/TestEm2/src/RunAction.cc

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: RunAction.cc,v 1.24 2009/09/16 18:07:30 maire Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// $Id: RunAction.cc,v 1.25 2010/02/22 15:41:29 maire Exp $
+// GEANT4 tag $Name: geant4-09-04-beta-01 $
 // 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
@@ -143 +143 @@
   histo[3] = hf->createHistogram1D( "4","longit energy profile (% of E inc)",
                                     nLbin,0.,nLbin*dLradl);
+                                    
+  histo[4] = hf->createHistogram1D( "5","rms on longit Edep (% of E inc)",
+                                    nLbin,0.,nLbin*dLradl);
 
   G4double Zmin=0.5*dLradl, Zmax=Zmin+nLbin*dLradl;
-  histo[4] = hf->createHistogram1D( "5","cumul longit energy dep (% of E inc)",
+  histo[5] = hf->createHistogram1D( "6","cumul longit energy dep (% of E inc)",
                                     nLbin,Zmin,Zmax);
-
-  histo[5] = hf->createHistogram1D( "6","rms on cumul longit Edep (% of E inc)",
+                                    
+  histo[6] = hf->createHistogram1D( "7","rms on cumul longit Edep (% of E inc)",
                                     nLbin,Zmin,Zmax);
 
-  histo[6] = hf->createHistogram1D("7","radial energy profile (% of E inc)",
+  histo[7] = hf->createHistogram1D( "8","radial energy profile (% of E inc)",
                                     nRbin,0.,nRbin*dRradl);
+                                                                    
+  histo[8] = hf->createHistogram1D( "9","rms on radial Edep (% of E inc)",
+                                    nRbin,0.,nRbin*dRradl);         
 
   G4double Rmin=0.5*dRradl, Rmax=Rmin+nRbin*dRradl;
-  histo[7]= hf->createHistogram1D("8","cumul radial energy dep (% of E inc)",
+  histo[9] = hf->createHistogram1D("10","cumul radial energy dep (% of E inc)",
                                     nRbin,Rmin,Rmax);
 
-  histo[8]= hf->createHistogram1D("9","rms on cumul radial Edep (% of E inc)",
-                                    nRbin,Rmin,Rmax);
+  histo[10]= hf->createHistogram1D("11","rms on cumul radial Edep (% of E inc)",
+                                    nRbin,Rmin,Rmax);               
                                     
  delete hf;
@@ -293 +299 @@
       G4double bin = (i+0.5)*dLradl;
       histo[3]->fill(bin,MeanELongit[i]/dLradl);
+      histo[4]->fill(bin, rmsELongit[i]/dLradl);      
       bin = (i+1)*dLradl;
-      histo[4]->fill(bin,MeanELongitCumul[i]);
-      histo[5]->fill(bin, rmsELongitCumul[i]);
+      histo[5]->fill(bin,MeanELongitCumul[i]);
+      histo[6]->fill(bin, rmsELongitCumul[i]);
     }
 #endif
@@ -320 +327 @@
     if(tree) {
       G4double bin = (i+0.5)*dRradl;
-      histo[6]->fill(bin,MeanERadial[i]/dRradl);
+      histo[7]->fill(bin,MeanERadial[i]/dRradl);
+      histo[8]->fill(bin, rmsERadial[i]/dRradl);      
       bin = (i+1)*dRradl;
-      histo[7]->fill(bin,MeanERadialCumul[i]);
-      histo[8]->fill(bin, rmsERadialCumul[i]);
+      histo[9] ->fill(bin,MeanERadialCumul[i]);
+      histo[10]->fill(bin, rmsERadialCumul[i]);
     }
 #endif

trunk/examples/extended/electromagnetic/TestEm2/src/RunActionMessenger.cc

@@ -25 +25 @@
 //
 // $Id: RunActionMessenger.cc,v 1.4 2006/06/29 16:50:50 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/TestEm2/src/StepMax.cc

@@ -25 +25 @@
 //
 // $Id: StepMax.cc,v 1.2 2006/06/29 16:50:52 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/TestEm2/src/StepMaxMessenger.cc

@@ -25 +25 @@
 //
 // $Id: StepMaxMessenger.cc,v 1.2 2006/06/29 16:50:54 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/TestEm2/src/SteppingAction.cc

@@ -25 +25 @@
 //
 // $Id: SteppingAction.cc,v 1.6 2006/06/29 16:50:57 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/TestEm2/src/SteppingVerbose.cc

@@ -25 +25 @@
 //
 // $Id: SteppingVerbose.cc,v 1.3 2006/06/29 16:50:59 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/TestEm2/src/TrackingAction.cc

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