Skip to content
Snippets Groups Projects
Commit 79e13908 authored by Chad Lantz's avatar Chad Lantz
Browse files

Started changing StackingAction to EventAction

parent 6b2d3b71
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
include/AirSD.hh
+ 0
− 7
View file @ 79e13908
......@@ -31,10 +31,6 @@
#include "G4VSensitiveDetector.hh"
#include "AirHit.hh"
#include "TH1D.h"
#include "TH2D.h"
#include "TH3D.h"
class G4Step;
class G4HCofThisEvent;
......@@ -51,10 +47,7 @@ public:
private:
int HCID;
G4double m_modCoreIndexRefraction;
HitsCollection* hitCollection;
G4int m_modNum;
TH2D* h2_rodNum_eDep;
};
#endif
include/OpNoviceStackingAction.hh deleted 100644 → 0
+ 0
− 59
View file @ 6b2d3b71
//
// ********************************************************************
// * License and Disclaimer *
// * *
// * The Geant4 software is copyright of the Copyright Holders of *
// * the Geant4 Collaboration. It is provided under the terms and *
// * conditions of the Geant4 Software License, included in the file *
// * LICENSE and available at http://cern.ch/geant4/license . These *
// * include a list of copyright holders. *
// * *
// * Neither the authors of this software system, nor their employing *
// * institutes,nor the agencies providing financial support for this *
// * work make any representation or warranty, express or implied, *
// * regarding this software system or assume any liability for its *
// * use. Please see the license in the file LICENSE and URL above *
// * for the full disclaimer and the limitation of liability. *
// * *
// * This code implementation is the result of the scientific and *
// * technical work of the GEANT4 collaboration. *
// * By using, copying, modifying or distributing the software (or *
// * any work based on the software) you agree to acknowledge its *
// * use in resulting scientific publications, and indicate your *
// * acceptance of all terms of the Geant4 Software license. *
// ********************************************************************
//
/// \file OpNovice/include/OpNoviceStackingAction.hh
/// \brief Definition of the OpNoviceStackingAction class
//
//
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
#ifndef OpNoviceStackingAction_H
#define OpNoviceStackingAction_H 1
#include "globals.hh"
#include "G4UserStackingAction.hh"
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
class OpNoviceStackingAction : public G4UserStackingAction
{
public:
OpNoviceStackingAction();
virtual ~OpNoviceStackingAction();
public:
virtual G4ClassificationOfNewTrack ClassifyNewTrack(const G4Track* aTrack);
virtual void NewStage();
virtual void PrepareNewEvent();
private:
G4int fScintillationCounter;
G4int fCerenkovCounter;
};
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
#endif
src/AirSD.cc
+ 1
− 3
View file @ 79e13908
......@@ -70,7 +70,7 @@ void AirSD::Initialize(G4HCofThisEvent* HCE){
hitCollection = new HitsCollection(SensitiveDetectorName,
m_modNum);
std::string name = collectionName[0];
std::string name = GetName();
if(HCID<0)
{ HCID = G4SDManager::GetSDMpointer()->GetCollectionID( name );}
......@@ -89,8 +89,6 @@ G4bool AirSD::ProcessHits(G4Step* aStep,G4TouchableHistory*){
G4double energy = aStep->GetPreStepPoint()->GetTotalEnergy();
G4ThreeVector momentum = aStep->GetPreStepPoint()->GetMomentum();
G4ParticleDefinition *particle = aStep->GetTrack()->GetDefinition();
G4double charge = aStep->GetPreStepPoint()->GetCharge();
AirHit* newHit = new AirHit();
......
src/OpNoviceRunAction.cc
+ 22
− 124
View file @ 79e13908
......@@ -33,6 +33,7 @@
#include "G4Timer.hh"
#include "OpNoviceRunAction.hh"
#include "lgAnalysis.hh"
#include "G4Run.hh"
......@@ -42,107 +43,34 @@
*/
OpNoviceRunAction::OpNoviceRunAction()
: G4UserRunAction(),
fTimer(0)
{
fTimer(0){
fTimer = new G4Timer;
G4RunManager::GetRunManager()->SetPrintProgress(1);
auto analysisManager = G4AnalysisManager::Instance();
G4cout << "Using " << analysisManager->GetType() << G4endl;
analysisManager->CreateNtuple("lightGuide", "pos and momentum");
analysisManager->CreateNtupleDColumn("trackID");
analysisManager->CreateNtupleDColumn("pos");
analysisManager->CreateNtupleDColumn("momentum");
analysisManager->CreateNtupleDColumn("energy");
analysisManager->FinishNtuple();
}
/*
*
*/
OpNoviceRunAction::~OpNoviceRunAction()
{
OpNoviceRunAction::~OpNoviceRunAction(){
delete fTimer;
}
/*
*
*/
void OpNoviceRunAction::BeginOfRunAction(const G4Run* aRun)
{
void OpNoviceRunAction::BeginOfRunAction(const G4Run* aRun){
G4cout << "### Run " << aRun->GetRunID() << " start." << G4endl;
fTimer->Start();
}
/*
*
*/
void OpNoviceRunAction::EndOfRunAction(const G4Run* aRun)
{
fTimer->Stop();
G4cout << "number of event = " << aRun->GetNumberOfEvent()
<< " " << *fTimer << G4endl;
}
/// \file B4RunAction.cc
/// \brief Implementation of the B4RunAction class
#include "B4RunAction.hh"
#include "B4Analysis.hh"
#include "G4Run.hh"
#include "G4RunManager.hh"
#include "G4UnitsTable.hh"
#include "G4SystemOfUnits.hh"
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
/////////////// How to implement root file output //////////////
/*
B4RunAction::B4RunAction()
: G4UserRunAction()
{
// set printing event number per each event
G4RunManager::GetRunManager()->SetPrintProgress(1);
// Create analysis manager
// The choice of analysis technology is done via selectin of a namespace
// in B4Analysis.hh
auto analysisManager = G4AnalysisManager::Instance();
G4cout << "Using " << analysisManager->GetType() << G4endl;
// Create directories
//analysisManager->SetHistoDirectoryName("histograms");
//analysisManager->SetNtupleDirectoryName("ntuple");
analysisManager->SetVerboseLevel(1);
analysisManager->SetNtupleMerging(true);
// Note: merging ntuples is available only with Root output
// Book histograms, ntuple
//
// Creating histograms
analysisManager->CreateH1("Eabs","Edep in absorber", 100, 0., 800*MeV);
analysisManager->CreateH1("Egap","Edep in gap", 100, 0., 100*MeV);
analysisManager->CreateH1("Labs","trackL in absorber", 100, 0., 1*m);
analysisManager->CreateH1("Lgap","trackL in gap", 100, 0., 50*cm);
// Creating ntuple
//
analysisManager->CreateNtuple("B4", "Edep and TrackL");
analysisManager->CreateNtupleDColumn("Eabs");
analysisManager->CreateNtupleDColumn("Egap");
analysisManager->CreateNtupleDColumn("Labs");
analysisManager->CreateNtupleDColumn("Lgap");
analysisManager->FinishNtuple();
}
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
B4RunAction::~B4RunAction()
{
delete G4AnalysisManager::Instance();
}
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
void B4RunAction::BeginOfRunAction(const G4Run* /*run*/)
{
//inform the runManager to save random number seed
//G4RunManager::GetRunManager()->SetRandomNumberStore(true);
// Get analysis manager
auto analysisManager = G4AnalysisManager::Instance();
......@@ -153,46 +81,16 @@ void B4RunAction::BeginOfRunAction(const G4Run* /*run*/)
analysisManager->OpenFile(fileName);
}
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
void B4RunAction::EndOfRunAction(const G4Run* /*run*/)
{
// print histogram statistics
//
auto analysisManager = G4AnalysisManager::Instance();
if ( analysisManager->GetH1(1) ) {
G4cout << G4endl << " ----> print histograms statistic ";
if(isMaster) {
G4cout << "for the entire run " << G4endl << G4endl;
}
else {
G4cout << "for the local thread " << G4endl << G4endl;
}
G4cout << " EAbs : mean = "
<< G4BestUnit(analysisManager->GetH1(0)->mean(), "Energy")
<< " rms = "
<< G4BestUnit(analysisManager->GetH1(0)->rms(), "Energy") << G4endl;
G4cout << " EGap : mean = "
<< G4BestUnit(analysisManager->GetH1(1)->mean(), "Energy")
<< " rms = "
<< G4BestUnit(analysisManager->GetH1(1)->rms(), "Energy") << G4endl;
G4cout << " LAbs : mean = "
<< G4BestUnit(analysisManager->GetH1(2)->mean(), "Length")
<< " rms = "
<< G4BestUnit(analysisManager->GetH1(2)->rms(), "Length") << G4endl;
G4cout << " LGap : mean = "
<< G4BestUnit(analysisManager->GetH1(3)->mean(), "Length")
<< " rms = "
<< G4BestUnit(analysisManager->GetH1(3)->rms(), "Length") << G4endl;
}
/*
*
*/
void OpNoviceRunAction::EndOfRunAction(const G4Run* aRun){
fTimer->Stop();
G4cout << "number of event = " << aRun->GetNumberOfEvent()
<< " " << *fTimer << G4endl;
// save histograms & ntuple
//
analysisManager->Write();
analysisManager->CloseFile();
}
*/
src/OpNoviceStackingAction.cc deleted 100644 → 0
+ 0
− 90
View file @ 6b2d3b71
//
// ********************************************************************
// * License and Disclaimer *
// * *
// * The Geant4 software is copyright of the Copyright Holders of *
// * the Geant4 Collaboration. It is provided under the terms and *
// * conditions of the Geant4 Software License, included in the file *
// * LICENSE and available at http://cern.ch/geant4/license . These *
// * include a list of copyright holders. *
// * *
// * Neither the authors of this software system, nor their employing *
// * institutes,nor the agencies providing financial support for this *
// * work make any representation or warranty, express or implied, *
// * regarding this software system or assume any liability for its *
// * use. Please see the license in the file LICENSE and URL above *
// * for the full disclaimer and the limitation of liability. *
// * *
// * This code implementation is the result of the scientific and *
// * technical work of the GEANT4 collaboration. *
// * By using, copying, modifying or distributing the software (or *
// * any work based on the software) you agree to acknowledge its *
// * use in resulting scientific publications, and indicate your *
// * acceptance of all terms of the Geant4 Software license. *
// ********************************************************************
//
/// \file OpNovice/src/OpNoviceStackingAction.cc
/// \brief Implementation of the OpNoviceStackingAction class
//
//
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
#include "OpNoviceStackingAction.hh"
#include "G4VProcess.hh"
#include "G4ParticleDefinition.hh"
#include "G4ParticleTypes.hh"
#include "G4Track.hh"
#include "G4ios.hh"
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
OpNoviceStackingAction::OpNoviceStackingAction()
: G4UserStackingAction(),
fScintillationCounter(0), fCerenkovCounter(0)
{}
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
OpNoviceStackingAction::~OpNoviceStackingAction()
{}
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
G4ClassificationOfNewTrack
OpNoviceStackingAction::ClassifyNewTrack(const G4Track * aTrack)
{
if(aTrack->GetDefinition() == G4OpticalPhoton::OpticalPhotonDefinition())
{ // particle is optical photon
if(aTrack->GetParentID()>0)
{ // particle is secondary
if(aTrack->GetCreatorProcess()->GetProcessName() == "Scintillation")
fScintillationCounter++;
if(aTrack->GetCreatorProcess()->GetProcessName() == "Cerenkov")
fCerenkovCounter++;
}
}
return fUrgent;
}
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
void OpNoviceStackingAction::NewStage()
{
G4cout << "Number of Scintillation photons produced in this event : "
<< fScintillationCounter << G4endl;
G4cout << "Number of Cerenkov photons produced in this event : "
<< fCerenkovCounter << G4endl;
}
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
void OpNoviceStackingAction::PrepareNewEvent()
{
fScintillationCounter = 0;
fCerenkovCounter = 0;
}
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment