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

Files:

• G3toG4DetectorConstruction.cc (modified) (1 diff)
• G3toG4EventAction.cc (modified) (3 diffs)
• G3toG4EventActionMessenger.cc (modified) (1 diff)
• G3toG4PhysicsList.cc (modified) (6 diffs)
• G3toG4PrimaryGeneratorAction.cc (modified) (1 diff)
• G3toG4RunAction.cc (modified) (1 diff)

trunk/examples/extended/g3tog4/cltog4/src/G3toG4DetectorConstruction.cc

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

trunk/examples/extended/g3tog4/cltog4/src/G3toG4EventAction.cc

@@ -25 +25 @@
 //
 //
-// $Id: G3toG4EventAction.cc,v 1.6 2006/06/29 17:20:56 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// $Id: G3toG4EventAction.cc,v 1.7 2010/06/06 04:57:51 perl Exp $
+// GEANT4 tag $Name: geant4-09-04-beta-01 $
 //
 // 
@@ -40 +40 @@
 #include "G4HCofThisEvent.hh"
 #include "G4TrajectoryContainer.hh"
-#include "G4Trajectory.hh"
-#include "G4VVisManager.hh"
 #include "G4UImanager.hh"
 #include "G4UnitsTable.hh"
@@ -78 +76 @@
   G4cout << "    " << n_trajectories 
          << " trajectories stored in this event." << G4endl;
-
-  if(G4VVisManager::GetConcreteInstance()){
-    for(G4int i=0; i<n_trajectories; i++) {
-      G4Trajectory* trj = (G4Trajectory*)(*(Ev->GetTrajectoryContainer()))[i];
-      if (drawFlag == "all") trj->DrawTrajectory(50);
-      else if ((drawFlag == "charged")&&(trj->GetCharge() != 0.))
-        trj->DrawTrajectory(50); 
-    }
-  }
 }
 

trunk/examples/extended/g3tog4/cltog4/src/G3toG4EventActionMessenger.cc

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

trunk/examples/extended/g3tog4/cltog4/src/G3toG4PhysicsList.cc

@@ -25 +25 @@
 //
 //
-// $Id: G3toG4PhysicsList.cc,v 1.5 2006/06/29 17:21:00 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// $Id: G3toG4PhysicsList.cc,v 1.6 2010/03/18 09:44:13 gcosmo Exp $
+// GEANT4 tag $Name: geant4-09-04-beta-01 $
 //
 // 
@@ -153 +153 @@
 #include "G4PhotoElectricEffect.hh"
 
-#include "G4MultipleScattering.hh"
+#include "G4eMultipleScattering.hh"
+#include "G4MuMultipleScattering.hh"
+#include "G4hMultipleScattering.hh"
 
 #include "G4eIonisation.hh"
@@ -183 +185 @@
     } else if (particleName == "e-") {
       //electron
-      pmanager->AddProcess(new G4MultipleScattering(),-1, 1,1);
+      pmanager->AddProcess(new G4eMultipleScattering(),-1, 1,1);
       pmanager->AddProcess(new G4eIonisation(),       -1, 2,2);
       pmanager->AddProcess(new G4eBremsstrahlung(),   -1, 3,3);      
@@ -189 +191 @@
     } else if (particleName == "e+") {
       //positron      
-      pmanager->AddProcess(new G4MultipleScattering(),-1, 1,1);
+      pmanager->AddProcess(new G4eMultipleScattering(),-1, 1,1);
       pmanager->AddProcess(new G4eIonisation(),       -1, 2,2);
       pmanager->AddProcess(new G4eBremsstrahlung(),   -1, 3,3);
@@ -197 +199 @@
                particleName == "mu-"    ) {
      //muon  
-     pmanager->AddProcess(new G4MultipleScattering(),-1, 1,1);
+     pmanager->AddProcess(new G4MuMultipleScattering(),-1, 1,1);
      pmanager->AddProcess(new G4MuIonisation(),      -1, 2,2);
      pmanager->AddProcess(new G4MuBremsstrahlung(),  -1, 3,3);
@@ -206 +208 @@
                (particle->GetParticleName() != "chargedgeantino")) {
       //all others charged particles except geantino
-      pmanager->AddProcess(new G4MultipleScattering(),-1,1,1);
+      pmanager->AddProcess(new G4hMultipleScattering(),-1,1,1);
       pmanager->AddProcess(new G4hIonisation(),       -1,2,2);
     }

trunk/examples/extended/g3tog4/cltog4/src/G3toG4PrimaryGeneratorAction.cc

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

trunk/examples/extended/g3tog4/cltog4/src/G3toG4RunAction.cc

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