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

Files:

• F01CalorHit.cc (modified) (1 diff)
• F01CalorimeterSD.cc (modified) (1 diff)
• F01DetectorConstruction.cc (modified) (1 diff)
• F01DetectorMessenger.cc (modified) (1 diff)
• F01EventAction.cc (modified) (3 diffs)
• F01EventActionMessenger.cc (modified) (1 diff)
• F01FieldMessenger.cc (modified) (1 diff)
• F01FieldSetup.cc (modified) (1 diff)
• F01PhysicsList.cc (modified) (7 diffs)
• F01PhysicsListMessenger.cc (modified) (1 diff)
• F01PrimaryGeneratorAction.cc (modified) (1 diff)
• F01PrimaryGeneratorMessenger.cc (modified) (1 diff)
• F01RunAction.cc (modified) (1 diff)
• F01RunMessenger.cc (modified) (1 diff)
• F01StepCut.cc (modified) (1 diff)
• F01SteppingAction.cc (modified) (1 diff)
• F01SteppingMessenger.cc (modified) (1 diff)
• F01SteppingVerbose.cc (modified) (1 diff)

trunk/examples/extended/field/field01/src/F01CalorHit.cc

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

trunk/examples/extended/field/field01/src/F01CalorimeterSD.cc

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

trunk/examples/extended/field/field01/src/F01DetectorConstruction.cc

@@ -26 +26 @@
 //
 // $Id: F01DetectorConstruction.cc,v 1.16 2009/11/05 01:07:41 gum Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-04-beta-01 $
 //
 // 

trunk/examples/extended/field/field01/src/F01DetectorMessenger.cc

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

trunk/examples/extended/field/field01/src/F01EventAction.cc

@@ -25 +25 @@
 //
 //
-// $Id: F01EventAction.cc,v 1.6 2006/06/29 17:16:29 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// $Id: F01EventAction.cc,v 1.7 2010/06/06 04:55:22 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 F01EventAction::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/field01/src/F01EventActionMessenger.cc

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

trunk/examples/extended/field/field01/src/F01FieldMessenger.cc

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

trunk/examples/extended/field/field01/src/F01FieldSetup.cc

@@ -26 +26 @@
 //
 // $Id: F01FieldSetup.cc,v 1.7 2006/06/29 17:16:36 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-04-beta-01 $
 //
 //   User Field setup class implementation.

trunk/examples/extended/field/field01/src/F01PhysicsList.cc

@@ -25 +25 @@
 //
 //
-// $Id: F01PhysicsList.cc,v 1.12 2007/05/23 09:14:09 japost Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// $Id: F01PhysicsList.cc,v 1.15 2010/04/08 14:09:44 gcosmo Exp $
+// GEANT4 tag $Name: geant4-09-04-beta-01 $
 // 
 
@@ -55 +55 @@
 F01PhysicsList::F01PhysicsList(F01DetectorConstruction* 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"
@@ -215 +216 @@
       // Construct processes for electron 
 
-      // theeminusMultipleScattering = new G4MultipleScattering();
+      // theeminusMultipleScattering = new G4eMultipleScattering();
      theeminusIonisation = new G4eIonisation();
      theeminusBremsstrahlung = new G4eBremsstrahlung();
@@ -238 +239 @@
       // Construct processes for positron
 
-      //   theeplusMultipleScattering = new G4MultipleScattering();
+      //   theeplusMultipleScattering = new G4eMultipleScattering();
       theeplusIonisation = new G4eIonisation();
       theeplusBremsstrahlung = new G4eBremsstrahlung();
@@ -264 +265 @@
 
       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);
@@ -285 +286 @@
 
       G4hIonisation* thehIonisation = new G4hIonisation() ; 
-      G4MultipleScattering* thehMultipleScattering =
-                     new G4MultipleScattering() ;
+      G4hMultipleScattering* thehMultipleScattering =
+                     new G4hMultipleScattering() ;
 
 

trunk/examples/extended/field/field01/src/F01PhysicsListMessenger.cc

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

trunk/examples/extended/field/field01/src/F01PrimaryGeneratorAction.cc

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

trunk/examples/extended/field/field01/src/F01PrimaryGeneratorMessenger.cc

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

trunk/examples/extended/field/field01/src/F01RunAction.cc

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

trunk/examples/extended/field/field01/src/F01RunMessenger.cc

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

trunk/examples/extended/field/field01/src/F01StepCut.cc

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

trunk/examples/extended/field/field01/src/F01SteppingAction.cc

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

trunk/examples/extended/field/field01/src/F01SteppingMessenger.cc

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

trunk/examples/extended/field/field01/src/F01SteppingVerbose.cc

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