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

Legend:

Unmodified
Added
Removed

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

    r1230 r1337  
    2727//
    2828// $Id: DetectorConstruction.cc,v 1.8 2007/11/12 15:48:58 maire Exp $
    29 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     29// GEANT4 tag $Name: geant4-09-04-beta-01 $
    3030//
    3131//

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

    r1230 r1337  
    2525//
    2626// $Id: DetectorMessenger.cc,v 1.3 2006/06/29 16:36:57 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/TestEm1/src/EventAction.cc

    r1230 r1337  
    2525//
    2626//
    27 // $Id: EventAction.cc,v 1.7 2007/11/12 15:48:58 maire Exp $
    28 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     27// $Id: EventAction.cc,v 1.9 2010/06/07 05:40:45 perl Exp $
     28// GEANT4 tag $Name: geant4-09-04-beta-01 $
    2929//
    3030//
    … …  
    3838
    3939#include "G4Event.hh"
    40 #include "G4TrajectoryContainer.hh"
    41 #include "G4Trajectory.hh"
    42 #include "G4VVisManager.hh"
    4340#include "G4UnitsTable.hh"
    4441
    … …  
    7572//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
    7673
    77 void EventAction::EndOfEventAction(const G4Event* evt)
     74void EventAction::EndOfEventAction(const G4Event*)
    7875{
    7976  if (drawFlag != "none") G4cout << " Energy deposit: "
    8077                                 << G4BestUnit(TotalEnergyDeposit,"Energy")
    8178                                 << G4endl;
    82 
    83   if (G4VVisManager::GetConcreteInstance())
    84   {
    85    G4TrajectoryContainer* trajectoryContainer = evt->GetTrajectoryContainer();
    86    G4int n_trajectories = 0;
    87    if (trajectoryContainer) n_trajectories = trajectoryContainer->entries(); 
    88    for(G4int i=0; i<n_trajectories; i++)
    89       { G4Trajectory* trj = (G4Trajectory*)
    90                                        ((*(evt->GetTrajectoryContainer()))[i]);
    91         if (drawFlag == "all") trj->DrawTrajectory(100);
    92         else if ((drawFlag == "charged")&&(trj->GetCharge() != 0.))
    93                                trj->DrawTrajectory(100);
    94       }
    95   }
    9679}
    9780

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

    r1230 r1337  
    2525//
    2626// $Id: EventActionMessenger.cc,v 1.3 2006/06/29 16:37:01 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/TestEm1/src/HistoManager.cc

    r1230 r1337  
    2525//
    2626// $Id: HistoManager.cc,v 1.13 2008/09/12 16:32:25 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/TestEm1/src/HistoMessenger.cc

    r1230 r1337  
    2525//
    2626// $Id: HistoMessenger.cc,v 1.6 2007/11/12 15:48:58 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/TestEm1/src/PhysListEmStandard.cc

    r1230 r1337  
    2626//
    2727// $Id: PhysListEmStandard.cc,v 1.21 2009/11/13 15:44:28 maire Exp $
    28 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-beta-01 $
    2929//
    3030//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

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

    r1230 r1337  
    2626//
    2727// $Id: PhysicsList.cc,v 1.12 2009/09/15 12:51:49 maire Exp $
    28 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-beta-01 $
    2929//
    3030//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

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

    r1230 r1337  
    2525//
    2626// $Id: PhysicsListMessenger.cc,v 1.3 2006/06/29 16:37:19 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/TestEm1/src/PrimaryGeneratorAction.cc

    r1230 r1337  
    2626//
    2727// $Id: PrimaryGeneratorAction.cc,v 1.4 2006/06/29 16:37:21 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-beta-01 $
    2929//
    3030//

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

    r1230 r1337  
    2525//
    2626// $Id: PrimaryGeneratorMessenger.cc,v 1.4 2006/06/29 16:37:23 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/TestEm1/src/RunAction.cc

    r1230 r1337  
    2424// ********************************************************************
    2525//
    26 // $Id: RunAction.cc,v 1.19 2006/06/29 16:37:25 gunter Exp $
    27 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     26// $Id: RunAction.cc,v 1.20 2010/04/06 11:11:24 maire Exp $
     27// GEANT4 tag $Name: geant4-09-04-beta-01 $
    2828//
    2929//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
    … …  
    4747RunAction::RunAction(DetectorConstruction* det, PrimaryGeneratorAction* kin,
    4848                     HistoManager* histo)
    49 :detector(det), primary(kin), ProcCounter(0), histoManager(histo)
     49:detector(det), primary(kin), histoManager(histo)
    5050{ }
    5151
    … …  
    7070  projRange = projRange2 = 0.;
    7171  transvDev = transvDev2 = 0.;   
    72   ProcCounter = new ProcessesCount;
    7372     
    7473  //histograms
    7574  //
    7675  histoManager->book();
    77 }
    78 
    79 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
    80 
    81 void RunAction::CountProcesses(G4String procName)
    82 {
    83    //does the process  already encounted ?
    84    size_t nbProc = ProcCounter->size();
    85    size_t i = 0;
    86    while ((i<nbProc)&&((*ProcCounter)[i]->GetName()!=procName)) i++;
    87    if (i == nbProc) ProcCounter->push_back( new OneProcessCount(procName));
    88 
    89    (*ProcCounter)[i]->Count();
    9076}
    9177
    … …  
    132118        << G4endl;
    133119     
    134  //frequency of processes call       
    135  G4cout << "\n nb of process calls per event: \n   ";       
    136  for (size_t i=0; i< ProcCounter->size();i++)
    137      G4cout << std::setw(12) << (*ProcCounter)[i]->GetName();
     120 //frequency of processes call
     121 std::map<G4String,G4int>::iterator it;         
     122 G4cout << "\n nb of process calls per event: \n   ";       
     123 for (it = procCounter.begin(); it != procCounter.end(); it++) 
     124    G4cout << std::setw(12) << it->first;
    138125           
    139126 G4cout << "\n   ";       
    140  for (size_t j=0; j< ProcCounter->size();j++)
    141  G4cout << std::setw(12) << ((*ProcCounter)[j]->GetCounter())/dNbOfEvents;
     127 for (it = procCounter.begin(); it != procCounter.end(); it++)   
     128    G4cout << std::setw(12) << (it->second)/dNbOfEvents;
    142129 G4cout << G4endl;
    143130     
    … …  
    186173 G4cout.precision(prec);
    187174                                   
    188   // delete and remove all contents in ProcCounter
    189   while (ProcCounter->size()>0){
    190     OneProcessCount* aProcCount=ProcCounter->back();
    191     ProcCounter->pop_back();
    192     delete aProcCount;
    193   }
    194   delete ProcCounter;
    195  
     175  // remove all contents in procCounter
     176  procCounter.clear();
     177   
    196178  //save histograms     
    197179  histoManager->save();

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

    r1230 r1337  
    2525//
    2626// $Id: StepMax.cc,v 1.2 2006/06/29 16:37:27 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/TestEm1/src/StepMaxMessenger.cc

    r1230 r1337  
    2525//
    2626// $Id: StepMaxMessenger.cc,v 1.2 2006/06/29 16:37:29 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/TestEm1/src/SteppingAction.cc

    r1230 r1337  
    2525//
    2626// $Id: SteppingAction.cc,v 1.8 2006/06/29 16:37:31 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/TestEm1/src/SteppingVerbose.cc

    r1230 r1337  
    2626//
    2727// $Id: SteppingVerbose.cc,v 1.2 2006/06/29 16:37:34 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-beta-01 $
    2929//
    3030//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

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

    r1230 r1337  
    2525//
    2626// $Id: TrackingAction.cc,v 1.10 2006/06/29 16:37:36 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.