Changeset 1337 for trunk/examples/extended/field/field03/src

Timestamp:

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

Author:

garnier

Message:

tag geant4.9.4 beta 1 + modifs locales

Location:

trunk/examples/extended/field/field03/src

Files:

• F03CalorHit.cc (modified) (1 diff)
• F03CalorimeterSD.cc (modified) (1 diff)
• F03DetectorConstruction.cc (modified) (1 diff)
• F03DetectorMessenger.cc (modified) (1 diff)
• F03EventAction.cc (modified) (3 diffs)
• F03EventActionMessenger.cc (modified) (1 diff)
• F03FieldMessenger.cc (modified) (1 diff)
• F03FieldSetup.cc (modified) (1 diff)
• F03PhysicsList.cc (modified) (5 diffs)
• F03PhysicsListMessenger.cc (modified) (1 diff)
• F03PrimaryGeneratorAction.cc (modified) (1 diff)
• F03PrimaryGeneratorMessenger.cc (modified) (1 diff)
• F03RunAction.cc (modified) (1 diff)
• F03RunMessenger.cc (modified) (1 diff)
• F03StepCut.cc (modified) (1 diff)
• F03SteppingAction.cc (modified) (1 diff)
• F03SteppingMessenger.cc (modified) (1 diff)
• F03SteppingVerbose.cc (modified) (1 diff)

trunk/examples/extended/field/field03/src/F03CalorHit.cc

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

trunk/examples/extended/field/field03/src/F03CalorimeterSD.cc

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

trunk/examples/extended/field/field03/src/F03DetectorConstruction.cc

@@ -26 +26 @@
 //
 // $Id: F03DetectorConstruction.cc,v 1.13 2009/11/05 01:10:06 gum Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-04-beta-01 $
 //
 // 

trunk/examples/extended/field/field03/src/F03DetectorMessenger.cc

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

trunk/examples/extended/field/field03/src/F03EventAction.cc

@@ -25 +25 @@
 //
 //
-// $Id: F03EventAction.cc,v 1.6 2006/06/29 17:19:28 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// $Id: F03EventAction.cc,v 1.7 2010/06/06 04:56:36 perl Exp $
+// GEANT4 tag $Name: geant4-09-04-beta-01 $
 //
 // 
@@ -45 +45 @@
 #include "G4VHitsCollection.hh"
 #include "G4SDManager.hh"
-#include "G4TrajectoryContainer.hh"
-#include "G4Trajectory.hh"
-#include "G4VVisManager.hh"
 #include "G4ios.hh"
 #include "G4UnitsTable.hh"
@@ -91 +88 @@
 void F03EventAction::EndOfEventAction(const G4Event* evt)
 {
-  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)
     G4cout << "<<< Event  " << evt->GetEventID() << " ended." << G4endl;

trunk/examples/extended/field/field03/src/F03EventActionMessenger.cc

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

trunk/examples/extended/field/field03/src/F03FieldMessenger.cc

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

trunk/examples/extended/field/field03/src/F03FieldSetup.cc

@@ -26 +26 @@
 //
 // $Id: F03FieldSetup.cc,v 1.5 2007/04/28 01:31:12 gum Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-04-beta-01 $
 //
 //  

trunk/examples/extended/field/field03/src/F03PhysicsList.cc

@@ -25 +25 @@
 //
 //
-// $Id: F03PhysicsList.cc,v 1.11 2007/05/23 13:39:16 tnikitin Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// $Id: F03PhysicsList.cc,v 1.13 2010/04/08 14:12:20 gcosmo Exp $
+// GEANT4 tag $Name: geant4-09-04-beta-01 $
 // 
 
@@ -55 +55 @@
 F03PhysicsList::F03PhysicsList(F03DetectorConstruction* p)
 :  G4VUserPhysicsList(), MaxChargedStep(DBL_MAX),
-   thePhotoElectricEffect(0), theComptonScattering(0), theGammaConversion(0),
-   theeminusMultipleScattering(0), theeminusIonisation(0),
-   theeminusBremsstrahlung(0),
-   theeplusMultipleScattering(0), theeplusIonisation(0),
+   thePhotoElectricEffect(0), theComptonScattering(0),
+   theGammaConversion(0), theeminusIonisation(0),
+   theeminusBremsstrahlung(0), theeplusIonisation(0),
    theeplusBremsstrahlung(0), theeplusAnnihilation(0),
    theeminusStepCut(0), theeplusStepCut(0)
@@ -173 +172 @@
 #include "G4PhotoElectricEffect.hh"
 
-#include "G4MultipleScattering.hh"
+#include "G4eMultipleScattering.hh"
+#include "G4MuMultipleScattering.hh"
+#include "G4hMultipleScattering.hh"
 
 #include "G4eIonisation.hh"
@@ -248 +249 @@
 
       G4MuIonisation* themuIonisation = new G4MuIonisation() ;
-      pmanager->AddProcess(new G4MultipleScattering(),-1,1,1);
+      pmanager->AddProcess(new G4MuMultipleScattering(),-1,1,1);
       pmanager->AddProcess(themuIonisation,-1,2,2);
       pmanager->AddProcess(new G4MuBremsstrahlung(),-1,-1,3);
@@ -267 +268 @@
 
       G4hIonisation* thehIonisation = new G4hIonisation() ; 
-      G4MultipleScattering* thehMultipleScattering =
-                     new G4MultipleScattering() ;
+      G4hMultipleScattering* thehMultipleScattering =
+                     new G4hMultipleScattering() ;
 
 

trunk/examples/extended/field/field03/src/F03PhysicsListMessenger.cc

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

trunk/examples/extended/field/field03/src/F03PrimaryGeneratorAction.cc

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

trunk/examples/extended/field/field03/src/F03PrimaryGeneratorMessenger.cc

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

trunk/examples/extended/field/field03/src/F03RunAction.cc

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

trunk/examples/extended/field/field03/src/F03RunMessenger.cc

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

trunk/examples/extended/field/field03/src/F03StepCut.cc

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

trunk/examples/extended/field/field03/src/F03SteppingAction.cc

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

trunk/examples/extended/field/field03/src/F03SteppingMessenger.cc

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

trunk/examples/extended/field/field03/src/F03SteppingVerbose.cc

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