Skip to content

GuardRing Hits and XE in EVTA file #148

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

Draft
ckierans wants to merge 12 commits into
base: develop/em
Choose a base branch
from
Draft

GuardRing Hits and XE in EVTA file #148

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
706c2e5
Pass through GR hits
ckierans Apr 14, 2026
adfaf1c
Rebased with current develop/em
ckierans Apr 14, 2026
c24de08
GR hits now passed thru revan
ckierans May 8, 2026
27183e5
Include GR and XE hits in evta
ckierans May 19, 2026
1acb1e5
Rebase error, now compiles
ckierans Aug 11, 2026
6e901f1
Correcting GRHit position definition
ckierans Aug 11, 2026
8866071
Merged with latest develop/em
ckierans Sep 22, 2026
5b6419c
Undid some unnecessary changes for depth distribution
ckierans Sep 22, 2026
f074062
Robustify GR Volume Search
ckierans Sep 22, 2026
915defd
Streaming XE and GR into dat file
ckierans Sep 22, 2026
47a1ad3
Merge branch 'develop/em' into gr_passthru
ckierans Sep 25, 2026
8e0b132
Prevent Revan from crashing
ckierans Sep 25, 2026
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
1 change: 1 addition & 0 deletions include/MModuleDepthCalibration.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,6 +197,7 @@ class MModuleDepthCalibration : public MModule
uint64_t m_ErrorNullSH;
uint64_t m_ErrorNoE;
unordered_map<int, MDDetector*> m_Detectors;
unordered_map<int, MDDetector*> m_GRDetectors;
vector<unsigned int> m_DetectorIDs;
MModuleEnergyCalibration* m_EnergyCalibration;
MGUIExpoDepthCalibration* m_ExpoDepthCalibration;
Expand Down
102 changes: 62 additions & 40 deletions src/MHit.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,18 @@ bool MHit::StreamDat(ostream& S, int Version)
}
} else if (Version == 3) {
// Stream the hit information, including low-voltage and high-voltage energy, then stream the strip hit information
S<<"HT "<<m_Position.GetX()<<" "<<m_Position.GetY()<<" "<<m_Position.GetZ()<<" "<<m_Energy<<" "<<m_LVEnergy<<" "<<m_HVEnergy<<endl;
if ((m_GuardRingHit == false) && (m_NoDepth == false)) {
S<<"HT "<<m_Position.GetX()<<" "<<m_Position.GetY()<<" "<<m_Position.GetZ()<<" "<<m_Energy<<" "<<m_LVEnergy<<" "<<m_HVEnergy<<endl;

} else if (m_GuardRingHit == true) {
S<<"GR "<<m_Position.GetX()<<";"<<m_Position.GetY()<<";"<<m_Position.GetZ()<<";"<<m_Energy;
S<<endl;

} else if (m_NoDepth == true) {
S<<"XE "<<m_Position.GetX()<<";"<<m_Position.GetY()<<";"<<m_Position.GetZ()<<";"<<m_Energy;
Comment thread
fhagemann marked this conversation as resolved.
S<<endl;
}

for (auto SH : m_StripHits) {
SH->StreamDat(S, 0);
}
Expand All @@ -230,54 +241,65 @@ void MHit::StreamEvta(ostream& S)
{
// Stream the hit in MEGAlib's EVTA format

// Assemble the origin information
vector<int> Origins;

// Only origins existing on both low-voltage and high-voltage strips count
vector<int> LVOrigins;
vector<int> HVOrigins;
for (unsigned int s = 0; s < GetNStripHits(); ++s) {
MStripHit* StripHit = m_StripHits[s];
vector<int> NewOrigins = StripHit->GetOrigins();
if (StripHit->IsLowVoltageStrip() == true) {
for (int o: NewOrigins) {
LVOrigins.push_back(o);
}
} else {
for (int o: NewOrigins) {
HVOrigins.push_back(o);
}
}
}

sort(LVOrigins.begin(), LVOrigins.end());
LVOrigins.erase(unique(LVOrigins.begin(), LVOrigins.end()), LVOrigins.end());
sort(HVOrigins.begin(), HVOrigins.end());
HVOrigins.erase(unique(HVOrigins.begin(), HVOrigins.end()), HVOrigins.end());
if ((m_GuardRingHit == false) && (m_NoDepth == false)) {

set_intersection(LVOrigins.begin(), LVOrigins.end(),
HVOrigins.begin(), HVOrigins.end(),
std::back_inserter(Origins));
// Assemble the origin information
vector<int> Origins;

if ((LVOrigins.size() != 0 || HVOrigins.size() != 0) && Origins.size() == 0) {
// If strip pairing mixed the hits completely, keep the mixed origin information
// Only origins existing on both low-voltage and high-voltage strips count
vector<int> LVOrigins;
vector<int> HVOrigins;
for (unsigned int s = 0; s < GetNStripHits(); ++s) {
MStripHit* StripHit = m_StripHits[s];
vector<int> NewOrigins = StripHit->GetOrigins();
for (int o: NewOrigins) {
Origins.push_back(o);
if (StripHit->IsLowVoltageStrip() == true) {
for (int o: NewOrigins) {
LVOrigins.push_back(o);
}
} else {
for (int o: NewOrigins) {
HVOrigins.push_back(o);
}
}
}
sort(Origins.begin(), Origins.end());
Origins.erase(unique(Origins.begin(), Origins.end()), Origins.end());
}

S<<"HT 3;"<<m_Position.GetX()<<";"<<m_Position.GetY()<<";"<<m_Position.GetZ()<<";"<<m_Energy
<<";"<<m_PositionResolution.GetX()<<";"<<m_PositionResolution.GetY()<<";"<<m_PositionResolution.GetZ()<<";"<<m_EnergyResolution;
for (unsigned int i = 0; i < Origins.size(); ++i) {
S<<";"<<Origins[i];
sort(LVOrigins.begin(), LVOrigins.end());
LVOrigins.erase(unique(LVOrigins.begin(), LVOrigins.end()), LVOrigins.end());
sort(HVOrigins.begin(), HVOrigins.end());
HVOrigins.erase(unique(HVOrigins.begin(), HVOrigins.end()), HVOrigins.end());

set_intersection(LVOrigins.begin(), LVOrigins.end(),
HVOrigins.begin(), HVOrigins.end(),
std::back_inserter(Origins));

if ((LVOrigins.size() != 0 || HVOrigins.size() != 0) && Origins.size() == 0) {
// If strip pairing mixed the hits completely, keep the mixed origin information
for (unsigned int s = 0; s < GetNStripHits(); ++s) {
MStripHit* StripHit = m_StripHits[s];
vector<int> NewOrigins = StripHit->GetOrigins();
for (int o: NewOrigins) {
Origins.push_back(o);
}
}
sort(Origins.begin(), Origins.end());
Origins.erase(unique(Origins.begin(), Origins.end()), Origins.end());
}

S<<"HT 3;"<<m_Position.GetX()<<";"<<m_Position.GetY()<<";"<<m_Position.GetZ()<<";"<<m_Energy
<<";"<<m_PositionResolution.GetX()<<";"<<m_PositionResolution.GetY()<<";"<<m_PositionResolution.GetZ()<<";"<<m_EnergyResolution;
for (unsigned int i = 0; i < Origins.size(); ++i) {
S<<";"<<Origins[i];
}
S<<endl;

} else if (m_GuardRingHit == true) {
S<<"GR "<<m_Position.GetX()<<";"<<m_Position.GetY()<<";"<<m_Position.GetZ()<<";"<<m_Energy;
S<<endl;

} else if (m_NoDepth == true) {
S<<"XE "<<m_Position.GetX()<<";"<<m_Position.GetY()<<";"<<m_Position.GetZ()<<";"<<m_Energy;
Comment thread
fhagemann marked this conversation as resolved.
S<<endl;
}
S<<endl;
}


Expand Down
Loading
Loading