Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[13_0_X SIM] Backport of ZDC transport modifier for heavy ion simulation modifier #43494

Merged
merged 4 commits into from
Dec 11, 2023
Merged

[13_0_X SIM] Backport of ZDC transport modifier for heavy ion simulation modifier #43494

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
38df996
added modifier for heavy ion simulation
civanch Dec 5, 2023
c38343a
minimal fix of ZdcSD
civanch Dec 5, 2023
b2fe149
exclude geantino
civanch Dec 5, 2023
9d07d2f
moved extra computations for debugging
civanch Dec 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 10 additions & 6 deletions SimG4CMS/Forward/src/ZdcSD.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,18 +122,17 @@ double ZdcSD::getEnergyDeposit(const G4Step* aStep) {

// preStepPoint information
G4StepPoint* preStepPoint = aStep->GetPreStepPoint();
G4VPhysicalVolume* currentPV = preStepPoint->GetPhysicalVolume();
std::string nameVolume = ForwardName::getName(currentPV->GetName());

const G4ThreeVector& hitPoint = preStepPoint->GetPosition();
const G4ThreeVector& hit_mom = preStepPoint->GetMomentumDirection();
G4double stepL = aStep->GetStepLength() / cm;
G4double beta = preStepPoint->GetBeta();
G4double charge = preStepPoint->GetCharge();
if (charge == 0.0)
return 0.0;

// theTrack information
G4Track* theTrack = aStep->GetTrack();
G4String particleType = theTrack->GetDefinition()->GetParticleName();
G4ThreeVector localPoint = theTrack->GetTouchable()->GetHistory()->GetTopTransform().TransformPoint(hitPoint);

#ifdef EDM_ML_DEBUG
Expand All @@ -156,7 +155,10 @@ double ZdcSD::getEnergyDeposit(const G4Step* aStep) {
// postStepPoint information
G4StepPoint* postStepPoint = aStep->GetPostStepPoint();
G4VPhysicalVolume* postPV = postStepPoint->GetPhysicalVolume();
G4VPhysicalVolume* currentPV = preStepPoint->GetPhysicalVolume();
std::string nameVolume = ForwardName::getName(currentPV->GetName());
std::string postnameVolume = ForwardName::getName(postPV->GetName());
G4String particleType = theTrack->GetDefinition()->GetParticleName();
edm::LogVerbatim("ForwardSim") << "ZdcSD:: getEnergyDeposit: \n"
<< " preStepPoint: " << nameVolume << "," << stepL << "," << stepE << "," << beta
<< "," << charge << "\n"
Expand All @@ -165,7 +167,7 @@ double ZdcSD::getEnergyDeposit(const G4Step* aStep) {
<< " Etot(GeV)= " << theTrack->GetTotalEnergy() / GeV;
#endif
const double bThreshold = 0.67;
if ((beta > bThreshold) && (charge != 0) && (nameVolume == "ZDC_EMFiber" || nameVolume == "ZDC_HadFiber")) {
if (beta > bThreshold) {
#ifdef EDM_ML_DEBUG
edm::LogVerbatim("ForwardSim") << "ZdcSD:: getEnergyDeposit: pass ";
#endif
Expand Down Expand Up @@ -293,10 +295,12 @@ double ZdcSD::getEnergyDeposit(const G4Step* aStep) {
// determine failure mode: beta, charge, and/or nameVolume
if (beta <= bThreshold)
edm::LogVerbatim("ForwardSim") << "ZdcSD:: getEnergyDeposit: fail beta=" << beta;
if (charge == 0)
edm::LogVerbatim("ForwardSim") << "ZdcSD:: getEnergyDeposit: fail charge=0";

#ifdef EDM_ML_DEBUG
std::string nameVolume = ForwardName::getName(currentPV->GetName());
if (!(nameVolume == "ZDC_EMFiber" || nameVolume == "ZDC_HadFiber"))
edm::LogVerbatim("ForwardSim") << "ZdcSD:: getEnergyDeposit: fail nv=" << nameVolume;
#endif
}

return NCherPhot;
Expand Down
7 changes: 7 additions & 0 deletions SimG4Core/Application/interface/SteppingAction.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,13 +43,15 @@ class SteppingAction : public G4UserSteppingAction {

inline bool isInsideDeadRegion(const G4Region* reg) const;
inline bool isOutOfTimeWindow(const G4Region* reg, const double& time) const;
inline bool isForZDC(const G4LogicalVolume* lv, int pdg) const;

bool isLowEnergy(const G4LogicalVolume*, const G4Track*) const;
void PrintKilledTrack(const G4Track*, const TrackStatus&) const;

EventAction* eventAction_;
const G4VPhysicalVolume *tracker, *calo;
const CMSSteppingVerbose* steppingVerbose;
const G4LogicalVolume* m_CMStoZDC{nullptr};
double theCriticalEnergyForVacuum;
double theCriticalDensity;
double maxTrackTime;
Expand All @@ -65,6 +67,7 @@ class SteppingAction : public G4UserSteppingAction {

bool initialized;
bool killBeamPipe;
bool m_CMStoZDCtransport;
bool hasWatcher;

std::vector<double> maxTrackTimes, ekinMins;
Expand Down Expand Up @@ -98,4 +101,8 @@ inline bool SteppingAction::isOutOfTimeWindow(const G4Region* reg, const double&
return (time > tofM);
}

inline bool SteppingAction::isForZDC(const G4LogicalVolume* lv, int pdg) const {
return (m_CMStoZDCtransport && lv == m_CMStoZDC && (pdg == 22 || pdg == 2112));
}

#endif
5 changes: 4 additions & 1 deletion SimG4Core/Application/python/g4SimHits_cfi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -334,6 +334,7 @@
),
SteppingAction = cms.PSet(
common_maximum_time,
CMStoZDCtransport = cms.bool(False),
MaxNumberOfSteps = cms.int32(20000),
EkinNames = cms.vstring(),
EkinThresholds = cms.vdouble(),
Expand Down Expand Up @@ -664,7 +665,9 @@
## Disable PPS from Run 3 PbPb runs
##
from Configuration.Eras.Modifier_pp_on_PbPb_run3_cff import pp_on_PbPb_run3
pp_on_PbPb_run3.toModify( g4SimHits, LHCTransport = False )
pp_on_PbPb_run3.toModify(g4SimHits, LHCTransport = False,
SteppingAction = dict(
CMStoZDCtransport = cms.bool(True) ) )

##
## Change ECAL time slices
Expand Down
9 changes: 7 additions & 2 deletions SimG4Core/Application/src/SteppingAction.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ SteppingAction::SteppingAction(EventAction* e, const edm::ParameterSet& p, const
if (0.0 < theCriticalEnergyForVacuum) {
killBeamPipe = true;
}
m_CMStoZDCtransport = (p.getParameter<bool>("CMStoZDCtransport"));
theCriticalDensity = (p.getParameter<double>("CriticalDensity") * CLHEP::g / CLHEP::cm3);
maxZCentralCMS = p.getParameter<double>("MaxZCentralCMS") * CLHEP::m;
maxTrackTime = p.getParameter<double>("MaxTrackTime") * CLHEP::ns;
Expand All @@ -46,7 +47,7 @@ SteppingAction::SteppingAction(EventAction* e, const edm::ParameterSet& p, const
<< " MaxTrackTime = " << maxTrackTime / CLHEP::ns << " ns;"
<< " MaxZCentralCMS = " << maxZCentralCMS / CLHEP::m << " m"
<< " MaxTrackTimeForward = " << maxTrackTimeForward / CLHEP::ns << " ns"
<< " MaxNumberOfSteps = " << maxNumberOfSteps;
<< " MaxNumberOfSteps = " << maxNumberOfSteps << " ZDC: " << m_CMStoZDCtransport;

numberTimes = maxTrackTimes.size();
if (numberTimes > 0) {
Expand Down Expand Up @@ -157,8 +158,9 @@ void SteppingAction::UserSteppingAction(const G4Step* aStep) {
const G4Region* theRegion = lv->GetRegion();

// kill in dead regions
if (isInsideDeadRegion(theRegion))
if (isInsideDeadRegion(theRegion) && !isForZDC(lv, std::abs(theTrack->GetParticleDefinition()->GetPDGEncoding()))) {
tstat = sDeadRegion;
}

// kill out of time
if (sAlive == tstat) {
Expand Down Expand Up @@ -245,6 +247,9 @@ bool SteppingAction::initPointer() {
ekinVolumes.resize(numberEkins, nullptr);
for (auto const& lvcite : *lvs) {
const G4String& lvname = lvcite->GetName();
if (lvname == "CMStoZDC" || lvname == "cmsextent:CMStoZDC") {
m_CMStoZDC = lvcite;
}
for (unsigned int i = 0; i < numberEkins; ++i) {
if (lvname == (G4String)(ekinNames[i])) {
ekinVolumes[i] = lvcite;
Expand Down