Skip to content

Improving sensitive hit creation for HMPID in Detector.cxx #8340

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

Merged
shahor02 merged 7 commits into from
Mar 19, 2022
Merged

Improving sensitive hit creation for HMPID in Detector.cxx #8340

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
82d2341
Update Detector.h
zovarga Mar 14, 2022
1dfe933
Update Detector.cxx
zovarga Mar 14, 2022
9d8b920
Formatting Detector.cxx
zovarga Mar 14, 2022
44bc2f0
Please consider the following formatting changes
alibuild Mar 14, 2022
a394f30
Merge pull request #3 from alibuild/alibot-cleanup-8340
zovarga Mar 14, 2022
63008bd
Formatting Detector.cxx
zovarga Mar 18, 2022
397f8f6
Merge branch 'AliceO2Group:dev' into hmpid_patch1
zovarga Mar 19, 2022
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
17 changes: 17 additions & 0 deletions Detectors/HMPID/simulation/include/HMPIDSimulation/Detector.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,23 @@ class Detector : public o2::base::DetImpl<Detector>

std::vector<TGeoVolume*> mSensitiveVolumes; //!

// Define volume IDs
int mHpad0VolID = -1;
int mHpad1VolID = -1;
int mHpad2VolID = -1;
int mHpad3VolID = -1;
int mHpad4VolID = -1;
int mHpad5VolID = -1;
int mHpad6VolID = -1;

int mHcel0VolID = -1;
int mHcel1VolID = -1;
int mHcel2VolID = -1;
int mHcel3VolID = -1;
int mHcel4VolID = -1;
int mHcel5VolID = -1;
int mHcel6VolID = -1;

template <typename Det>
friend class o2::base::DetImpl;
ClassDefOverride(Detector, 1);
Expand Down
63 changes: 53 additions & 10 deletions Detectors/HMPID/simulation/src/Detector.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,20 +46,36 @@ Detector::Detector(const Detector& other) : mSensitiveVolumes(other.mSensitiveVo

void Detector::InitializeO2Detector()
{
TVirtualMC* fMC = TVirtualMC::GetMC();
for (auto sensitiveHpad : mSensitiveVolumes) {
LOG(debug) << "HMPID: registering sensitive " << sensitiveHpad->GetName();
AddSensitiveVolume(sensitiveHpad);
mHpad0VolID = fMC->VolId("Hpad0");
mHpad1VolID = fMC->VolId("Hpad1");
mHpad2VolID = fMC->VolId("Hpad2");
mHpad3VolID = fMC->VolId("Hpad3");
mHpad4VolID = fMC->VolId("Hpad4");
mHpad5VolID = fMC->VolId("Hpad5");
mHpad6VolID = fMC->VolId("Hpad6");
mHcel0VolID = fMC->VolId("Hcel0");
mHcel1VolID = fMC->VolId("Hcel1");
mHcel2VolID = fMC->VolId("Hcel2");
mHcel3VolID = fMC->VolId("Hcel3");
mHcel4VolID = fMC->VolId("Hcel4");
mHcel5VolID = fMC->VolId("Hcel5");
mHcel6VolID = fMC->VolId("Hcel6");
}
}
//*********************************************************************************************************
bool Detector::ProcessHits(FairVolume* v)
{
TString volname = fMC->CurrentVolName();
Int_t copy;
Int_t volID = fMC->CurrentVolID(copy);
auto stack = (o2::data::Stack*)fMC->GetStack();

//Treat photons
//photon (Ckov or feedback) hits on module PC (Hpad)
if ((fMC->TrackPid() == 50000050 || fMC->TrackPid() == 50000051) && volname.Contains("Hpad")) {
if ((fMC->TrackPid() == 50000050 || fMC->TrackPid() == 50000051) && (volID == mHpad0VolID || volID == mHpad1VolID || volID == mHpad2VolID || volID == mHpad3VolID || volID == mHpad4VolID || volID == mHpad5VolID || volID == mHpad6VolID)) {
if (fMC->Edep() > 0) { //photon survided QE test i.e. produces electron
if (IsLostByFresnel()) {
fMC->StopTrack();
Expand All @@ -71,9 +87,22 @@ bool Detector::ProcessHits(FairVolume* v)
Double_t x[3];
fMC->TrackPosition(x[0], x[1], x[2]); //take MARS position at entrance to PC
Float_t hitTime = (Float_t)fMC->TrackTime(); //hit formation time
TString tmpname = volname;
tmpname.Remove(0, 4);
Int_t idch = tmpname.Atoi(); //retrieve the chamber number
Int_t idch; // chamber number
if (volID == mHpad0VolID) {
idch = 0;
} else if (volID == mHpad1VolID) {
idch = 1;
} else if (volID == mHpad2VolID) {
idch = 2;
} else if (volID == mHpad3VolID) {
idch = 3;
} else if (volID == mHpad4VolID) {
idch = 4;
} else if (volID == mHpad5VolID) {
idch = 5;
} else if (volID == mHpad6VolID) {
idch = 6;
}
Double_t xl, yl;
o2::hmpid::Param::instance()->mars2Lors(idch, x, xl, yl); //take LORS position
AddHit(x[0], x[1], x[2], hitTime, etot, tid, idch); //HIT for photon, position at P, etot will be set to Q
Expand All @@ -87,15 +116,16 @@ bool Detector::ProcessHits(FairVolume* v)
static Float_t eloss; //need to store mip parameters between different steps
static Double_t in[3];

if (fMC->IsTrackEntering() && fMC->TrackCharge() && volname.Contains("Hpad")) {
if (fMC->IsTrackEntering() && fMC->TrackCharge() && (volID == mHpad0VolID || volID == mHpad1VolID || volID == mHpad2VolID || volID == mHpad3VolID || volID == mHpad4VolID || volID == mHpad5VolID || volID == mHpad6VolID)) {
//Trackref stored when entering in the pad volume
o2::TrackReference tr(*fMC, GetDetId());
tr.setTrackID(stack->GetCurrentTrackNumber());
// tr.setUserId(lay);
stack->addTrackReference(tr);
}

if (fMC->TrackCharge() && volname.Contains("Hcel")) { //charged particle in amplification gap (Hcel)
if (fMC->TrackCharge() && (volID == mHcel0VolID || volID == mHcel1VolID || volID == mHcel2VolID || volID == mHcel3VolID || volID == mHcel4VolID || volID == mHcel5VolID || volID == mHcel6VolID)) {
// charged particle in amplification gap (Hcel)
if (fMC->IsTrackEntering() || fMC->IsNewTrack()) { //entering or newly created
eloss = 0; //reset Eloss collector
fMC->TrackPosition(in[0], in[1], in[2]); //take position at the entrance
Expand All @@ -109,9 +139,22 @@ bool Detector::ProcessHits(FairVolume* v)
out[0] = 0.5 * (out[0] + in[0]); //
out[1] = 0.5 * (out[1] + in[1]); //take hit position at the anod plane
out[2] = 0.5 * (out[2] + in[2]);
TString tmpname = volname;
tmpname.Remove(0, 4);
Int_t idch = tmpname.Atoi(); //retrieve the chamber number
Int_t idch; // chamber number
if (volID == mHcel0VolID) {
idch = 0;
} else if (volID == mHcel1VolID) {
idch = 1;
} else if (volID == mHcel2VolID) {
idch = 2;
} else if (volID == mHcel3VolID) {
idch = 3;
} else if (volID == mHcel4VolID) {
idch = 4;
} else if (volID == mHcel5VolID) {
idch = 5;
} else if (volID == mHcel6VolID) {
idch = 6;
}
Double_t xl, yl;
o2::hmpid::Param::instance()->mars2Lors(idch, out, xl, yl); //take LORS position
if (eloss > 0) {
Expand Down