diff --git a/include/SteppingAction.hh b/include/SteppingAction.hh index 231833259118122f4f68b77052956f2908572207..702e1ba22d6c12b4e65411a2f296986d44dae84c 100644 --- a/include/SteppingAction.hh +++ b/include/SteppingAction.hh @@ -46,9 +46,7 @@ class SteppingAction : public G4UserSteppingAction virtual void UserSteppingAction(const G4Step*); private: - G4int fScintillationCounter; - G4int fCerenkovCounter; - G4int fEventNumber; + }; //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/src/SteppingAction.cc b/src/SteppingAction.cc index 25e089665df68951f9f2e2d9f66da2002c07dcb3..a16c385c2c8cc8eb4d3aa04cb7d7e57603ac7d0d 100644 --- a/src/SteppingAction.cc +++ b/src/SteppingAction.cc @@ -41,50 +41,19 @@ SteppingAction::SteppingAction() : G4UserSteppingAction() { - fScintillationCounter = 0; - fCerenkovCounter = 0; - fEventNumber = -1; + } /* */ SteppingAction::~SteppingAction() -{ ; } +{ + +} /* */ void SteppingAction::UserSteppingAction(const G4Step* step) { - G4int eventNumber = G4RunManager::GetRunManager()-> - GetCurrentEvent()->GetEventID(); - - if (eventNumber != fEventNumber) { - fEventNumber = eventNumber; - fScintillationCounter = 0; - fCerenkovCounter = 0; - } - - G4Track* track = step->GetTrack(); - - G4String ParticleName = track->GetDynamicParticle()-> - GetParticleDefinition()->GetParticleName(); - - if (ParticleName == "opticalphoton") return; - - const std::vector<const G4Track*>* secondaries = - step->GetSecondaryInCurrentStep(); - if (secondaries->size()>0) { - for(unsigned int i=0; i<secondaries->size(); ++i) { - if (secondaries->at(i)->GetParentID()>0) { - if(secondaries->at(i)->GetDynamicParticle()->GetParticleDefinition() - == G4OpticalPhoton::OpticalPhotonDefinition()){ - if (secondaries->at(i)->GetCreatorProcess()->GetProcessName() - == "Scintillation")fScintillationCounter++; - if (secondaries->at(i)->GetCreatorProcess()->GetProcessName() - == "Cerenkov")fCerenkovCounter++; - } - } - } - } }