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/TestEm14/src
Files:
15 edited

Legend:

Unmodified
Added
Removed

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

    r1230 r1337  
    2525//
    2626// $Id: DetectorConstruction.cc,v 1.4 2006/06/29 16:45:33 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/TestEm14/src/DetectorMessenger.cc

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

    r1230 r1337  
    2424// ********************************************************************
    2525//
    26 // $Id: EventAction.cc,v 1.3 2006/06/29 16:45:37 gunter Exp $
    27 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     26// $Id: EventAction.cc,v 1.6 2010/06/07 05:40:46 perl Exp $
     27// GEANT4 tag $Name: geant4-09-04-beta-01 $
    2828//
    2929//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
    … …  
    3535
    3636#include "G4Event.hh"
    37 #include "G4TrajectoryContainer.hh"
    38 #include "G4Trajectory.hh"
    39 #include "G4VVisManager.hh"
    4037#include "G4UnitsTable.hh"
    4138
    … …  
    4340
    4441EventAction::EventAction()
    45 :printModulo(10000),eventMessenger(0)
     42:printModulo(100000),eventMessenger(0)
    4643{
    4744  eventMessenger = new EventActionMessenger(this);
    … …  
    6865//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
    6966
    70 void EventAction::EndOfEventAction(const G4Event* evt)
     67void EventAction::EndOfEventAction(const G4Event*)
    7168{
    72   if (G4VVisManager::GetConcreteInstance())
    73   {
    74     G4TrajectoryContainer* trajectoryContainer = evt->GetTrajectoryContainer();
    75     G4int n_trajectories = 0;
    76     if (trajectoryContainer) n_trajectories = trajectoryContainer->entries(); 
    77     for (G4int i=0; i<n_trajectories; i++) {
    78        G4Trajectory* trj = (G4Trajectory*)
    79                                        ((*(evt->GetTrajectoryContainer()))[i]);
    80        trj->DrawTrajectory(1000);
    81     }
    82   }
    8369}
    8470

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

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

    r1230 r1337  
    2525//
    2626// $Id: HistoManager.cc,v 1.7 2008/09/24 18:53:56 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/TestEm14/src/HistoMessenger.cc

    r1230 r1337  
    2525//
    2626// $Id: HistoMessenger.cc,v 1.4 2007/11/13 12:17:07 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/TestEm14/src/PhysListEmLivermore.cc

    r1230 r1337  
    2525//
    2626//
    27 // $Id: PhysListEmLivermore.cc,v 1.4 2009/11/19 10:36:37 maire Exp $
    28 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     27// $Id: PhysListEmLivermore.cc,v 1.5 2010/04/02 13:22:02 maire Exp $
     28// GEANT4 tag $Name: geant4-09-04-beta-01 $
    2929//
    3030//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
    … …  
    140140      eIoniModel->SetHighEnergyLimit(highEnergyLimit);
    141141      eIoni->AddEmModel(0, eIoniModel, new G4UniversalFluctuation() );
    142       pmanager->AddProcess(eIoni,                   -1, 1, 1);
     142      pmanager->AddProcess(eIoni,                   -1,-1, 1);
    143143     
    144144      G4eBremsstrahlung* eBrem = new G4eBremsstrahlung();
    … …  
    147147      eBremModel->SetHighEnergyLimit(highEnergyLimit);
    148148      eBrem->AddEmModel(0, eBremModel);
    149       pmanager->AddProcess(eBrem,                   -1, 2, 2);
     149      pmanager->AddProcess(eBrem,                   -1,-1, 2);
    150150           
    151151    } else if (particleName == "e+") {
    152152      //positron
    153       pmanager->AddProcess(new G4eIonisation,       -1, 1, 1);
    154       pmanager->AddProcess(new G4eBremsstrahlung,   -1, 2, 2);
     153      pmanager->AddProcess(new G4eIonisation,       -1,-1, 1);
     154      pmanager->AddProcess(new G4eBremsstrahlung,   -1,-1, 2);
    155155      pmanager->AddProcess(new G4eplusAnnihilation,  0,-1, 3);
    156156     
    … …  
    158158               particleName == "mu-"    ) {
    159159      //muon 
    160       pmanager->AddProcess(new G4MuIonisation,      -1, 1, 1);
    161       pmanager->AddProcess(new G4MuBremsstrahlung,  -1, 2, 2);
    162       pmanager->AddProcess(new G4MuPairProduction,  -1, 3, 3);       
     160      pmanager->AddProcess(new G4MuIonisation,      -1,-1, 1);
     161      pmanager->AddProcess(new G4MuBremsstrahlung,  -1,-1, 2);
     162      pmanager->AddProcess(new G4MuPairProduction,  -1,-1, 3);       
    163163     
    164164    } else if( particleName == "alpha" || particleName == "GenericIon" ) {
    165       pmanager->AddProcess(new G4ionIonisation,     -1, 1, 1);
     165      pmanager->AddProcess(new G4ionIonisation,     -1,-1, 1);
    166166
    167167    } else if ((!particle->IsShortLived()) &&
    … …  
    169169               (particle->GetParticleName() != "chargedgeantino")) {
    170170      //all others charged particles except geantino
    171       pmanager->AddProcess(new G4hIonisation,       -1, 1, 1);
     171      pmanager->AddProcess(new G4hIonisation,       -1,-1, 1);
    172172    }
    173173  }

  • trunk/examples/extended/electromagnetic/TestEm14/src/PhysListEmPenelope.cc

    r1230 r1337  
    2525//
    2626//
    27 // $Id: PhysListEmPenelope.cc,v 1.4 2009/11/19 10:36:37 maire Exp $
    28 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     27// $Id: PhysListEmPenelope.cc,v 1.5 2010/04/02 13:22:02 maire Exp $
     28// GEANT4 tag $Name: geant4-09-04-beta-01 $
    2929//
    3030//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
    … …  
    141141      eIoniModel->SetHighEnergyLimit(highEnergyLimit);
    142142      eIoni->AddEmModel(0, eIoniModel, new G4UniversalFluctuation() );
    143       pmanager->AddProcess(eIoni,                   -1, 1, 1);
     143      pmanager->AddProcess(eIoni,                   -1,-1, 1);
    144144     
    145145      G4eBremsstrahlung* eBrem = new G4eBremsstrahlung();
    … …  
    148148      eBremModel->SetHighEnergyLimit(highEnergyLimit);
    149149      eBrem->AddEmModel(0, eBremModel);
    150       pmanager->AddProcess(eBrem,                   -1, 2, 2);
     150      pmanager->AddProcess(eBrem,                   -1,-1, 2);
    151151           
    152152    } else if (particleName == "e+") {
    … …  
    157157      eIoniModel->SetHighEnergyLimit(highEnergyLimit);
    158158      eIoni->AddEmModel(0, eIoniModel, new G4UniversalFluctuation() );
    159       pmanager->AddProcess(eIoni,                   -1, 1, 1);
     159      pmanager->AddProcess(eIoni,                   -1,-1, 1);
    160160     
    161161      G4eBremsstrahlung* eBrem = new G4eBremsstrahlung();
    … …  
    164164      eBremModel->SetHighEnergyLimit(highEnergyLimit);
    165165      eBrem->AddEmModel(0, eBremModel);
    166       pmanager->AddProcess(eBrem,                   -1, 2, 2);     
     166      pmanager->AddProcess(eBrem,                   -1,-1, 2);     
    167167
    168168      G4eplusAnnihilation* eAnni = new G4eplusAnnihilation();
    … …  
    176176               particleName == "mu-"    ) {
    177177      //muon 
    178       pmanager->AddProcess(new G4MuIonisation,      -1, 1, 1);
    179       pmanager->AddProcess(new G4MuBremsstrahlung,  -1, 2, 2);
    180       pmanager->AddProcess(new G4MuPairProduction,  -1, 3, 3);       
     178      pmanager->AddProcess(new G4MuIonisation,      -1,-1, 1);
     179      pmanager->AddProcess(new G4MuBremsstrahlung,  -1,-1, 2);
     180      pmanager->AddProcess(new G4MuPairProduction,  -1,-1, 3);       
    181181     
    182182    } else if( particleName == "alpha" || particleName == "GenericIon" ) {
    183       pmanager->AddProcess(new G4ionIonisation,     -1, 1, 1);
     183      pmanager->AddProcess(new G4ionIonisation,     -1,-1, 1);
    184184
    185185    } else if ((!particle->IsShortLived()) &&
    … …  
    187187               (particle->GetParticleName() != "chargedgeantino")) {
    188188      //all others charged particles except geantino
    189       pmanager->AddProcess(new G4hIonisation,       -1, 1, 1);
     189      pmanager->AddProcess(new G4hIonisation,       -1,-1, 1);
    190190    }
    191191  }

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

    r1230 r1337  
    2525//
    2626//
    27 // $Id: PhysListEmStandard.cc,v 1.4 2006/10/24 16:54:16 maire Exp $
    28 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     27// $Id: PhysListEmStandard.cc,v 1.5 2010/04/02 13:22:02 maire Exp $
     28// GEANT4 tag $Name: geant4-09-04-beta-01 $
    2929//
    3030//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
    … …  
    8282    } else if (particleName == "e-") {
    8383      //electron
    84       pmanager->AddProcess(new G4eIonisation,        -1, 1,1);
    85       pmanager->AddProcess(new G4eBremsstrahlung,    -1, 2,2);
     84      pmanager->AddProcess(new G4eIonisation,        -1,-1,1);
     85      pmanager->AddProcess(new G4eBremsstrahlung,    -1,-1,2);
    8686           
    8787    } else if (particleName == "e+") {
    8888      //positron
    89       pmanager->AddProcess(new G4eIonisation,        -1, 1,1);
    90       pmanager->AddProcess(new G4eBremsstrahlung,    -1, 2,2);
     89      pmanager->AddProcess(new G4eIonisation,        -1,-1,1);
     90      pmanager->AddProcess(new G4eBremsstrahlung,    -1,-1,2);
    9191      pmanager->AddProcess(new G4eplusAnnihilation,   0,-1,3);
    9292     
    … …  
    9494               particleName == "mu-"    ) {
    9595      //muon 
    96       pmanager->AddProcess(new G4MuIonisation,      -1, 1,1);
    97       pmanager->AddProcess(new G4MuBremsstrahlung,  -1, 2,2);
    98       pmanager->AddProcess(new G4MuPairProduction,  -1, 3,3);       
     96      pmanager->AddProcess(new G4MuIonisation,      -1,-1,1);
     97      pmanager->AddProcess(new G4MuBremsstrahlung,  -1,-1,2);
     98      pmanager->AddProcess(new G4MuPairProduction,  -1,-1,3);       
    9999     
    100100    } else if( particleName == "alpha" || particleName == "GenericIon" ) {
    101       pmanager->AddProcess(new G4ionIonisation,     -1, 1,1);
     101      pmanager->AddProcess(new G4ionIonisation,     -1,-1,1);
    102102
    103103    } else if ((!particle->IsShortLived()) &&
    … …  
    105105               (particle->GetParticleName() != "chargedgeantino")) {
    106106      //all others charged particles except geantino
    107       pmanager->AddProcess(new G4hIonisation,       -1,1,1);
     107      pmanager->AddProcess(new G4hIonisation,       -1,-1,1);
    108108    }
    109109  }

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

    r1230 r1337  
    2525//
    2626//
    27 // $Id: PhysicsList.cc,v 1.6 2009/11/19 10:36:37 maire Exp $
    28 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     27// $Id: PhysicsList.cc,v 1.8 2010/04/05 18:02:39 maire Exp $
     28// GEANT4 tag $Name: geant4-09-04-beta-01 $
    2929//
    3030//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
    … …  
    183183  //
    184184  G4EmProcessOptions emOptions;
    185   emOptions.SetStepFunction(1., 1*mm); 
    186185  emOptions.SetIntegral(false);
    187   emOptions.SetLossFluctuations(false);   
    188186}
    189187
    … …  
    227225
    228226void PhysicsList::SetCuts()
    229 {   
    230   // set cut values for gamma at first and for e- second and next for e+,
    231   // because some processes for e+/e- need cut values for gamma
    232   SetCutValue(cutForGamma, "gamma");
    233   SetCutValue(cutForElectron, "e-");
    234   SetCutValue(cutForPositron, "e+");
     227{
     228 // fixe lower limit for cut
     229 G4ProductionCutsTable::GetProductionCutsTable()->SetEnergyRange(100*eV, 1*GeV);
     230 
     231 // set cut values for gamma at first and for e- second and next for e+,
     232 // because some processes for e+/e- need cut values for gamma
     233 SetCutValue(cutForGamma, "gamma");
     234 SetCutValue(cutForElectron, "e-");
     235 SetCutValue(cutForPositron, "e+");
    235236}
    236237

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

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

    r1230 r1337  
    2525//
    2626// $Id: PrimaryGeneratorAction.cc,v 1.3 2006/06/29 16:45: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/TestEm14/src/RunAction.cc

    r1230 r1337  
    2424// ********************************************************************
    2525//
    26 // $Id: RunAction.cc,v 1.4 2006/09/06 09:56:06 maire Exp $
    27 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     26// $Id: RunAction.cc,v 1.5 2010/04/05 18:02:39 maire Exp $
     27// GEANT4 tag $Name: geant4-09-04-beta-01 $
    2828//
    2929//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
    … …  
    4949RunAction::RunAction(DetectorConstruction* det, PrimaryGeneratorAction* prim,
    5050                     HistoManager* histo)
    51   : detector(det), primary(prim), ProcCounter(0), histoManager(histo)
     51  : detector(det), primary(prim), histoManager(histo)
    5252{ }
    5353
    … …  
    6767  CLHEP::HepRandom::showEngineStatus();
    6868
    69   ProcCounter = new ProcessesCount;
    7069  totalCount = 0;
    7170  sumTrack = sumTrack2 = 0.;
    … …  
    7372 
    7473  histoManager->book();
    75 }
    76 
    77 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
    78 
    79 void RunAction::CountProcesses(G4String procName)
    80 {
    81    //does the process  already encounted ?
    82    size_t nbProc = ProcCounter->size();
    83    size_t i = 0;
    84    while ((i<nbProc)&&((*ProcCounter)[i]->GetName()!=procName)) i++;
    85    if (i == nbProc) ProcCounter->push_back( new OneProcessCount(procName));
    86 
    87    (*ProcCounter)[i]->Count();
    8874}
    8975
    … …  
    11399  //frequency of processes
    114100  G4cout << "\n Process calls frequency --->";
    115   for (size_t i=0; i< ProcCounter->size();i++) {
    116      G4String procName = (*ProcCounter)[i]->GetName();
    117      G4int    count    = (*ProcCounter)[i]->GetCounter();
     101  std::map<G4String,G4int>::iterator it; 
     102  for (it = procCounter.begin(); it != procCounter.end(); it++) {
     103     G4String procName = it->first;
     104     G4int    count    = it->second;
    118105     G4cout << "\t" << procName << " = " << count;
    119106     if (procName == "Transportation") survive = count;
    120107  }
    121  
     108     
    122109  if (survive > 0) {
    123110    G4cout << "\n\n Nb of incident particles surviving after "
    … …  
    160147  G4EmCalculator emCalculator;
    161148  G4double sumc = 0.0; 
    162   for (size_t i=0; i< ProcCounter->size();i++) {
    163     G4String procName = (*ProcCounter)[i]->GetName();
     149  for (it = procCounter.begin(); it != procCounter.end(); it++) {
     150    G4String procName = it->first;     
    164151    G4double massSigma =
    165152    emCalculator.GetCrossSectionPerVolume(energy,particle,
    … …  
    177164                 
    178165  //restore default format       
    179   G4cout.precision(prec);         
    180 
    181   // delete and remove all contents in ProcCounter
    182   while (ProcCounter->size()>0){
    183     OneProcessCount* aProcCount=ProcCounter->back();
    184     ProcCounter->pop_back();
    185     delete aProcCount;
    186   }
    187   delete ProcCounter;
     166  G4cout.precision(prec);
     167           
     168  // remove all contents in procCounter
     169  procCounter.clear();
    188170 
    189171  histoManager->save();

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

    r1230 r1337  
    2424// ********************************************************************
    2525//
    26 // $Id: SteppingAction.cc,v 1.5 2007/06/23 22:23:20 maire Exp $
    27 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     26// $Id: SteppingAction.cc,v 1.6 2010/04/02 13:22:02 maire Exp $
     27// GEANT4 tag $Name: geant4-09-04-beta-01 $
    2828//
    2929//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
    … …  
    3434#include "RunAction.hh"
    3535#include "HistoManager.hh"
    36 #include "SteppingMessenger.hh"
    3736
    3837#include "G4RunManager.hh"
    … …  
    4342                               RunAction* RuAct, HistoManager* Hist)
    4443:primary(prim),runAction(RuAct), histoManager(Hist)
    45 {
    46   stepMessenger = new SteppingMessenger(this);
    47   fract = 0.1;
    48 }
     44{ }
    4945
    5046//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
    5147
    5248SteppingAction::~SteppingAction()
    53 {
    54   delete stepMessenger;
    55 }
     49{ }
    5650
    5751//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
    … …  
    6054{
    6155  G4StepPoint* endPoint = aStep->GetPostStepPoint();
    62   G4String procName = endPoint->GetProcessDefinedStep()->GetProcessName();
    63   G4TrackVector* secondary = fpSteppingManager->GetSecondary();         
     56  G4String procName = endPoint->GetProcessDefinedStep()->GetProcessName();     
    6457  G4bool transmit = (endPoint->GetStepStatus() <= fGeomBoundary); 
    6558  if (transmit) runAction->CountProcesses(procName);
    … …  
    6760    //count real processes and sum track length
    6861    G4double stepLength = aStep->GetStepLength();
    69     G4double charge = aStep->GetTrack()->GetDefinition()->GetPDGCharge();
    70     if ((charge == 0.) || ((charge != 0.) && (((*secondary).size() > 0))))
    71       {
    72        runAction->CountProcesses(procName); 
    73        runAction->SumTrack(stepLength);
    74       }
     62    runAction->CountProcesses(procName); 
     63    runAction->SumTrack(stepLength);
    7564  }
    7665 
    7766  //plot final state (only if continuous energy loss is small enough)
    7867  //
    79   G4double edep = aStep->GetTotalEnergyDeposit();
    80   G4double E0 = primary->GetParticleGun()->GetParticleEnergy();
    81   if (edep < fract*E0) {
    8268   
    83     //scattered primary particle
    84     //
    85     G4int id = 1;
    86     if (aStep->GetTrack()->GetTrackStatus() == fAlive) {
    87       G4double energy = endPoint->GetKineticEnergy();     
    88       histoManager->FillHisto(id,energy);
     69  //scattered primary particle
     70  //
     71  G4int id = 1;
     72  if (aStep->GetTrack()->GetTrackStatus() == fAlive) {
     73    G4double energy = endPoint->GetKineticEnergy();     
     74    histoManager->FillHisto(id,energy);
    8975
    90       id = 2;
    91       G4ThreeVector direction = endPoint->GetMomentumDirection();
    92       G4double costeta = direction.x();
    93       histoManager->FillHisto(id,costeta);     
    94     } 
     76    id = 2;
     77    G4ThreeVector direction = endPoint->GetMomentumDirection();
     78    G4double costeta = direction.x();
     79    histoManager->FillHisto(id,costeta);     
     80  } 
    9581 
    96     //secondaries
    97     //
    98     //G4TrackVector* secondary = fpSteppingManager->GetSecondary();
    99     for (size_t lp=0; lp<(*secondary).size(); lp++) {
    100       G4double charge = (*secondary)[lp]->GetDefinition()->GetPDGCharge();
    101       if (charge != 0.) id = 3; else id = 5;
    102       G4double energy = (*secondary)[lp]->GetKineticEnergy();
    103       histoManager->FillHisto(id,energy);
     82  //secondaries
     83  //
     84  G4TrackVector* secondary = fpSteppingManager->GetSecondary();
     85  for (size_t lp=0; lp<(*secondary).size(); lp++) {
     86    G4double charge = (*secondary)[lp]->GetDefinition()->GetPDGCharge();
     87    if (charge != 0.) id = 3; else id = 5;
     88    G4double energy = (*secondary)[lp]->GetKineticEnergy();
     89    histoManager->FillHisto(id,energy);
    10490
    105       id++;
    106       G4ThreeVector direction = (*secondary)[lp]->GetMomentumDirection();     
    107       G4double costeta = direction.x();
    108       histoManager->FillHisto(id,costeta);
     91    id++;
     92    G4ThreeVector direction = (*secondary)[lp]->GetMomentumDirection();     
     93    G4double costeta = direction.x();
     94    histoManager->FillHisto(id,costeta);
    10995     
    110       //energy tranferred to charged secondaries
    111       if (charge != 0.) runAction->SumeTransf(energy);         
    112     }
     96    //energy tranferred to charged secondaries
     97    if (charge != 0.) runAction->SumeTransf(energy);         
    11398  }
    11499         

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

    r1230 r1337  
    2525//
    2626// $Id: SteppingVerbose.cc,v 1.3 2006/06/29 16:46:05 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.