Skip to content

Saving Strip Pairing Chi Square for Each Detector #121

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

Open
julianmgerber wants to merge 2 commits into
base: develop/em
Choose a base branch
from
Open

Saving Strip Pairing Chi Square for Each Detector #121

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4f2cd12
saving chi square for each detector
Apr 6, 2026
8e683b7
fixing bug in event filter
Apr 6, 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
10 changes: 5 additions & 5 deletions include/MReadOutAssembly.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,10 +245,10 @@ class MReadOutAssembly : public MReadOutSequence
//! Get the Strip Pairing quality flag
bool HasStripPairing_QualityFlag() const { return m_StripPairing_QualityFlag; }

//! Set the Reduced Chi^2 used in MultiRoundChiSquare module
void SetStripPairingReducedChiSquare(double StripPairingReducedChiSquare) { m_StripPairingReducedChiSquare = StripPairingReducedChiSquare; }
//! Return the Reduced Chi^2
double GetStripPairingReducedChiSquare() const { return m_StripPairingReducedChiSquare; }
//! Set the Reduced Chi^2 used in MultiRoundChiSquare module (one for each detector)
void SetStripPairingReducedChiSquare(double StripPairingReducedChiSquare) { m_StripPairingReducedChiSquare.push_back(StripPairingReducedChiSquare); }
//! Return all the Reduced Chi^2 (for each detector)
vector<double> GetStripPairingReducedChiSquare() const { return m_StripPairingReducedChiSquare; }

//! Set the Quality of this Event used in Greedy Strip pairing module
//! TODO Change name of this variable to be more descriptive or get rid of Greedy algorithim all together
Expand Down Expand Up @@ -430,7 +430,7 @@ class MReadOutAssembly : public MReadOutSequence
vector<MString> m_StripPairingString_QualityFlag;

//! Reduced Chi^2 of the Strip Paired Event
double m_StripPairingReducedChiSquare;
vector<double> m_StripPairingReducedChiSquare;

//! Quality of this event in Greedy strip pairing
//! TODO change variable name or remove Greedy approach all together
Expand Down
13 changes: 10 additions & 3 deletions src/MModuleEventFilter.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,11 +175,18 @@ bool MModuleEventFilter::AnalyzeEvent(MReadOutAssembly* Event)
}

// Apply Chi^2 filter (as calculated in strip pairing)

// Make sure there are actually reduced chi squares to filter on
const auto& ReducedChiSquareVector = Event->GetStripPairingReducedChiSquare();
if (ReducedChiSquareVector.size() > 0) {
double Maximum = *max_element(ReducedChiSquareVector.begin(), ReducedChiSquareVector.end());
double Minimum = *min_element(ReducedChiSquareVector.begin(), ReducedChiSquareVector.end());

if (Event->GetStripPairingReducedChiSquare() < m_MinimumStripPairingReducedChiSquare || Event->GetStripPairingReducedChiSquare() > m_MaximumStripPairingReducedChiSquare) {
FilteredOut = true;
// Filter based on the minimum and maximum reduced chi square in list
if (Minimum < m_MinimumStripPairingReducedChiSquare || Maximum > m_MaximumStripPairingReducedChiSquare) {
FilteredOut = true;
}

}

if (FilteredOut == true) {
Event->SetFilteredOut(true);
Expand Down
9 changes: 7 additions & 2 deletions src/MReadOutAssembly.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ void MReadOutAssembly::Clear()
m_EventReconstructionError = false;
m_EventReconstructionErrorString.clear();

m_StripPairingReducedChiSquare = -1;
m_StripPairingReducedChiSquare.clear();

m_StripHitBelowThreshold_QualityFlag = false;
m_StripHitBelowThresholdString_QualityFlag.clear();
Expand Down Expand Up @@ -541,7 +541,12 @@ bool MReadOutAssembly::StreamDat(ostream& S, int Version)
S<<"ID "<<m_ID<<endl;
S<<"CL "<<m_Time<<endl;
S<<"TI "<<m_EventTimeUTC<<endl;
S<<"QP "<<m_StripPairingReducedChiSquare<<endl; // Read out strip pairing qualiy factor
S<<"QP";
// iterate through the vectorized strip pairing reduced chi squares
for (auto i : m_StripPairingReducedChiSquare) {
S<<" "<<i;
}
S<<endl;
Copy link
Copy Markdown
Collaborator

@ckierans ckierans Apr 13, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You only have the streaming defined for the .dat file, but we also will want this in the evta file - that's the standard format for revan. This should probably be incorporated in the StreamBDFlags function where you already have the Strip Pairing quality flag printout. Unless there's a reason you had this pulled out separately?


for (MSimIA& IA: m_SimIAs) {
S<<IA.ToSimString()<<endl;
Expand Down