Ignore:
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/TestEm12/src
Files:
17 edited

Legend:

Unmodified
Added
Removed

  • trunk/examples/extended/electromagnetic/TestEm12/src/DetectorConstruction.cc

    r1230 r1337  
    2525//
    2626// $Id: DetectorConstruction.cc,v 1.2 2006/06/29 16:43:00 gunter Exp $
    27 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     27// GEANT4 tag $Name: geant4-09-04-beta-01 $
    2828//
    2929//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

  • trunk/examples/extended/electromagnetic/TestEm12/src/DetectorMessenger.cc

    r1230 r1337  
    2525//
    2626// $Id: DetectorMessenger.cc,v 1.2 2006/06/29 16:43:03 gunter Exp $
    27 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     27// GEANT4 tag $Name: geant4-09-04-beta-01 $
    2828//
    2929//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

  • trunk/examples/extended/electromagnetic/TestEm12/src/EventAction.cc

    r1230 r1337  
    2424// ********************************************************************
    2525//
    26 // $Id: EventAction.cc,v 1.2 2006/06/29 16:43:05 gunter Exp $
    27 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     26// $Id: EventAction.cc,v 1.4 2010/06/07 05:40:46 perl Exp $
     27// GEANT4 tag $Name: geant4-09-04-beta-01 $
    2828//
    2929//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
    … …  
    3737
    3838#include "G4Event.hh"
    39 #include "G4TrajectoryContainer.hh"
    40 #include "G4Trajectory.hh"
    41 #include "G4VVisManager.hh"
    4239
    4340//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
    … …  
    7269//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
    7370
    74 void EventAction::EndOfEventAction(const G4Event* evt)
     71void EventAction::EndOfEventAction(const G4Event*)
    7572{
    7673  //plot energy deposited per event
    … …  
    8077    histoManager->FillHisto(2,totalEdep);
    8178  } 
    82  
    83   //trajectories
    84   //
    85   if (G4VVisManager::GetConcreteInstance())
    86   {
    87    G4TrajectoryContainer* trajectoryContainer = evt->GetTrajectoryContainer();
    88    G4int n_trajectories = 0;
    89    if (trajectoryContainer) n_trajectories = trajectoryContainer->entries(); 
    90    for(G4int i=0; i<n_trajectories; i++)
    91       { G4Trajectory* trj = (G4Trajectory*)
    92                                        ((*(evt->GetTrajectoryContainer()))[i]);
    93         if (drawFlag == "all") trj->DrawTrajectory(1000);
    94         else if ((drawFlag == "charged")&&(trj->GetCharge() != 0.))
    95                                trj->DrawTrajectory(1000);
    96       }
    97   }
    9879}
    9980

  • trunk/examples/extended/electromagnetic/TestEm12/src/EventActionMessenger.cc

    r1230 r1337  
    2525//
    2626// $Id: EventActionMessenger.cc,v 1.2 2006/06/29 16:43:07 gunter Exp $
    27 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     27// GEANT4 tag $Name: geant4-09-04-beta-01 $
    2828//
    2929//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

  • trunk/examples/extended/electromagnetic/TestEm12/src/HistoManager.cc

    r1230 r1337  
    2525//
    2626// $Id: HistoManager.cc,v 1.11 2008/09/23 20:48:12 maire Exp $
    27 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     27// GEANT4 tag $Name: geant4-09-04-beta-01 $
    2828//
    2929//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

  • trunk/examples/extended/electromagnetic/TestEm12/src/HistoMessenger.cc

    r1230 r1337  
    2525//
    2626// $Id: HistoMessenger.cc,v 1.5 2008/01/11 13:11:31 jjacquem Exp $
    27 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     27// GEANT4 tag $Name: geant4-09-04-beta-01 $
    2828//
    2929//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

  • trunk/examples/extended/electromagnetic/TestEm12/src/PhysListEmStandard.cc

    r1230 r1337  
    2424// ********************************************************************
    2525//
    26 // $Id: PhysListEmStandard.cc,v 1.8 2009/11/16 16:18:27 maire Exp $
    27 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     26// $Id: PhysListEmStandard.cc,v 1.9 2010/05/20 13:13:33 maire Exp $
     27// GEANT4 tag $Name: geant4-09-04-beta-01 $
    2828//
    2929//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
    … …  
    3939
    4040#include "G4eMultipleScattering.hh"
     41#include "G4UrbanMscModel90.hh"
     42#include "G4UrbanMscModel92.hh"
    4143#include "G4UrbanMscModel93.hh"
    4244#include "G4eIonisation.hh"
    … …  
    148150    }
    149151  }
    150 
     152/*
    151153  // Em options
    152154  //
    … …  
    179181  //
    180182  emOptions.SetSubCutoff(false);        //default
     183*/ 
    181184}
    182185

  • trunk/examples/extended/electromagnetic/TestEm12/src/PhysicsList.cc

    r1230 r1337  
    2424// ********************************************************************
    2525//
    26 // $Id: PhysicsList.cc,v 1.8 2009/09/22 15:18:20 maire Exp $
    27 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     26// $Id: PhysicsList.cc,v 1.9 2010/05/20 13:13:33 maire Exp $
     27// GEANT4 tag $Name: geant4-09-04-beta-01 $
    2828//
    2929//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
    … …  
    3434
    3535#include "PhysListEmStandard.hh"
     36#include "PhysListEmStandardSS.hh"
     37#include "PhysListEmStandardGS.hh"
     38#include "PhysListEmStandardWVI.hh"
    3639
    3740#include "G4EmStandardPhysics.hh"
    … …  
    241244    delete emPhysicsList;
    242245    emPhysicsList = new G4EmStandardPhysics_option3();
    243            
     246   
     247  } else if (name == "standardSS") {
     248
     249    emName = name;
     250    delete emPhysicsList;
     251    emPhysicsList = new PhysListEmStandardSS(name);
     252
     253  } else if (name == "standardGS") {
     254
     255    emName = name;
     256    delete emPhysicsList;
     257    emPhysicsList = new PhysListEmStandardGS(name);
     258
     259  } else if (name == "standardWVI") {
     260
     261    emName = name;
     262    delete emPhysicsList;
     263    emPhysicsList = new PhysListEmStandardWVI(name);
     264               
    244265  } else if (name == "emlivermore") {
    245266    emName = name;

  • trunk/examples/extended/electromagnetic/TestEm12/src/PhysicsListMessenger.cc

    r1230 r1337  
    2525//
    2626// $Id: PhysicsListMessenger.cc,v 1.2 2006/06/29 16:43:30 gunter Exp $
    27 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     27// GEANT4 tag $Name: geant4-09-04-beta-01 $
    2828//
    2929//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

  • trunk/examples/extended/electromagnetic/TestEm12/src/PrimaryGeneratorAction.cc

    r1230 r1337  
    2525//
    2626// $Id: PrimaryGeneratorAction.cc,v 1.2 2006/06/29 16:43:32 gunter Exp $
    27 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     27// GEANT4 tag $Name: geant4-09-04-beta-01 $
    2828//
    2929//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

  • trunk/examples/extended/electromagnetic/TestEm12/src/PrimaryGeneratorMessenger.cc

    r1230 r1337  
    2525//
    2626// $Id: PrimaryGeneratorMessenger.cc,v 1.2 2006/06/29 16:43:34 gunter Exp $
    27 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     27// GEANT4 tag $Name: geant4-09-04-beta-01 $
    2828//
    2929//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

  • trunk/examples/extended/electromagnetic/TestEm12/src/RunAction.cc

    r1230 r1337  
    2525//
    2626// $Id: RunAction.cc,v 1.8 2007/08/19 20:57:29 maire Exp $
    27 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     27// GEANT4 tag $Name: geant4-09-04-beta-01 $
    2828//
    2929//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

  • trunk/examples/extended/electromagnetic/TestEm12/src/StepMax.cc

    r1230 r1337  
    2525//
    2626// $Id: StepMax.cc,v 1.3 2006/06/29 16:43:38 gunter Exp $
    27 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     27// GEANT4 tag $Name: geant4-09-04-beta-01 $
    2828//
    2929//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

  • trunk/examples/extended/electromagnetic/TestEm12/src/StepMaxMessenger.cc

    r1230 r1337  
    2525//
    2626// $Id: StepMaxMessenger.cc,v 1.3 2006/06/29 16:43:40 gunter Exp $
    27 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     27// GEANT4 tag $Name: geant4-09-04-beta-01 $
    2828//
    2929//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

  • trunk/examples/extended/electromagnetic/TestEm12/src/SteppingAction.cc

    r1230 r1337  
    2525//
    2626// $Id: SteppingAction.cc,v 1.4 2007/04/27 10:38:11 maire Exp $
    27 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     27// GEANT4 tag $Name: geant4-09-04-beta-01 $
    2828//
    2929//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

  • trunk/examples/extended/electromagnetic/TestEm12/src/SteppingVerbose.cc

    r1230 r1337  
    2525//
    2626// $Id: SteppingVerbose.cc,v 1.2 2006/06/29 16:43:46 gunter Exp $
    27 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     27// GEANT4 tag $Name: geant4-09-04-beta-01 $
    2828//
    2929//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

  • trunk/examples/extended/electromagnetic/TestEm12/src/TrackingAction.cc

    r1230 r1337  
    2525//
    2626// $Id: TrackingAction.cc,v 1.2 2006/06/29 16:43:48 gunter Exp $
    27 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     27// GEANT4 tag $Name: geant4-09-04-beta-01 $
    2828//
    2929//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
Note: See TracChangeset for help on using the changeset viewer.