Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
18 changes: 12 additions & 6 deletions muonShieldOptimization/exitHadronAbsorber.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -89,12 +89,14 @@ Bool_t exitHadronAbsorber::ProcessHits(FairVolume* vol) {
TParticle* p = gMC->GetStack()->GetCurrentTrack();
fUniqueID = p->GetUniqueID();
Int_t pdgCode = p->GetPdgCode();
Int_t idabs = TMath::Abs(pdgCode);
gMC->TrackMomentum(fMom);
if (!(fOnlyMuons && TMath::Abs(pdgCode) != 13)) {
if (!(fOnlyMuons && idabs != 13)) {
fTime = gMC->TrackTime() * 1.0e09;
fLength = gMC->TrackLength();
gMC->TrackPosition(fPos);
if ((fMom.E() - fMom.M()) > EMax) {
if (((fMom.E() - fMom.M()) > EMax) ||
(idabs == 12 || idabs == 14 || idabs == 16)) {
AddHit(fTrackID, 111, TVector3(fPos.X(), fPos.Y(), fPos.Z()),
TVector3(fMom.Px(), fMom.Py(), fMom.Pz()), fTime, fLength, 0,
pdgCode, TVector3(p->Vx(), p->Vy(), p->Vz()),
Expand Down Expand Up @@ -185,15 +187,19 @@ void exitHadronAbsorber::EndOfEvent() {

void exitHadronAbsorber::PreTrack() {
gMC->TrackMomentum(fMom);
if ((fMom.E() - fMom.M()) < EMax) {

TParticle* p = gMC->GetStack()->GetCurrentTrack();
Int_t pdgCode = p->GetPdgCode();
Int_t idabs = TMath::Abs(pdgCode);

if (((fMom.E() - fMom.M()) < EMax) && (idabs != 12) && (idabs != 14) &&
(idabs != 16)) {
gMC->StopTrack();
return;
}
TParticle* p = gMC->GetStack()->GetCurrentTrack();
Int_t pdgCode = p->GetPdgCode();

// record statistics for neutrinos, electrons and photons
// add pi0 111 eta 221 eta' 331 omega 223
Int_t idabs = TMath::Abs(pdgCode);
if (idabs < 18 || idabs == 22 || idabs == 111 || idabs == 221 ||
idabs == 223 || idabs == 331 || idabs == 211 || idabs == 321 ||
idabs == 2212) {
Expand Down
6 changes: 4 additions & 2 deletions shipgen/FixedTargetGenerator.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -473,13 +473,15 @@ Bool_t FixedTargetGenerator::ReadEvent(FairPrimaryGenerator* cpg) {
Double_t m = fPythia->event[ii].m();
Double_t pz = fPythia->event[ii].pz();
Int_t id = fPythia->event[ii].id();
Int_t absid = fabs(id);
Bool_t wanttracking = kTRUE;
if (e - m < EMax || !fPythia->event[ii].isFinal() || pz < 0) {
if (((e - m < EMax) && (absid != 12) && (absid != 14) && (absid != 16)) ||
!fPythia->event[ii].isFinal() || pz < 0) {
wanttracking = kFALSE;
}
if (DrellYan || PhotonCollision || OnlyMuons) {
// don't track underlying event
if (fabs(id) != 13) {
if (absid != 13) {
wanttracking = kFALSE;
}
}
Expand Down
Loading