Skip to content

Add secondary spatial observable for generation of gain map of TRestDataSetGainMap #553

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
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Add secondary spatial observable for generation of gain map of TRestDataSetGainMap #553

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2c733e0
Add secondary spatial observable for generation of gain map
AlvaroEzq Sep 9, 2025
08af633
add option to show/hide gain number in DrawGainMap
AlvaroEzq Sep 30, 2025
378db13
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Sep 30, 2025
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
15 changes: 13 additions & 2 deletions source/framework/analysis/inc/TRestDataSetGainMap.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,12 @@ class TRestDataSetGainMap : public TRestMetadata {
/// Observable that will be used to segmentize the gain map in the y direction
std::string fSpatialObservableY = ""; //<

/// Secondary observable that will be used to segmentize the gain map in the x direction (if needed)
std::string fSpatialObservableXSecondary = ""; //<

/// Secondary observable that will be used to segmentize the gain map in the y direction (if needed)
std::string fSpatialObservableYSecondary = ""; //<

/// List of modules
std::vector<Module> fModulesCal = {}; //<

Expand Down Expand Up @@ -83,6 +89,8 @@ class TRestDataSetGainMap : public TRestMetadata {
std::string GetObservable() const { return fObservable; }
std::string GetSpatialObservableX() const { return fSpatialObservableX; }
std::string GetSpatialObservableY() const { return fSpatialObservableY; }
std::string GetSpatialObservableXSecondary() const { return fSpatialObservableXSecondary; }
std::string GetSpatialObservableYSecondary() const { return fSpatialObservableYSecondary; }
TRestCut* GetCut() const { return fCut; }

Module* GetModule(const size_t index = 0);
Expand Down Expand Up @@ -119,7 +127,7 @@ class TRestDataSetGainMap : public TRestMetadata {
TRestDataSetGainMap(const char* configFilename, std::string name = "");
~TRestDataSetGainMap();

ClassDefOverride(TRestDataSetGainMap, 2);
ClassDefOverride(TRestDataSetGainMap, 3);

class Module {
private:
Expand Down Expand Up @@ -223,6 +231,8 @@ class TRestDataSetGainMap : public TRestMetadata {
std::string GetObservable() const { return p->fObservable; }
std::string GetSpatialObservableX() const { return p->fSpatialObservableX; }
std::string GetSpatialObservableY() const { return p->fSpatialObservableY; }
std::string GetSpatialObservableXSecondary() const { return p->fSpatialObservableXSecondary; }
std::string GetSpatialObservableYSecondary() const { return p->fSpatialObservableYSecondary; }
inline std::string GetModuleDefinitionCut() const { return fDefinitionCut; }
Int_t GetNumberOfSegmentsX() const { return fNumberOfSegmentsX; }
Int_t GetNumberOfSegmentsY() const { return fNumberOfSegmentsY; }
Expand All @@ -243,7 +253,8 @@ class TRestDataSetGainMap : public TRestMetadata {
void DrawLinearFit(const TVector2& position, TCanvas* c = nullptr);
void DrawLinearFit(const int index_x, const int index_y, TCanvas* c = nullptr);

void DrawGainMap(const int peakNumber = 0, const bool fullModuleAsRef = true);
void DrawGainMap(const int peakNumber = 0, const bool fullModuleAsRef = true,
const bool showText = true);

void Refit(const TVector2& position, const double energy, const TVector2& range);
void Refit(const size_t x, const size_t y, const size_t peakNumber, const TVector2& range);
Expand Down
24 changes: 22 additions & 2 deletions source/framework/analysis/src/TRestDataSetGainMap.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -430,6 +430,8 @@ TRestDataSetGainMap& TRestDataSetGainMap::operator=(TRestDataSetGainMap& src) {
fObservable = src.GetObservable();
fSpatialObservableX = src.GetSpatialObservableX();
fSpatialObservableY = src.GetSpatialObservableY();
fSpatialObservableXSecondary = src.GetSpatialObservableXSecondary();
fSpatialObservableYSecondary = src.GetSpatialObservableYSecondary();
fCut = src.GetCut();
fModulesCal.clear();
for (auto pID : src.GetPlaneIDs())
Expand Down Expand Up @@ -531,6 +533,10 @@ void TRestDataSetGainMap::PrintMetadata() {
RESTMetadata << " Calibration observable: " << fObservable << RESTendl;
RESTMetadata << " Spatial observable X: " << fSpatialObservableX << RESTendl;
RESTMetadata << " Spatial observable Y: " << fSpatialObservableY << RESTendl;
if (!fSpatialObservableXSecondary.empty())
RESTMetadata << " Secondary spatial observable X: " << fSpatialObservableXSecondary << RESTendl;
if (!fSpatialObservableYSecondary.empty())
RESTMetadata << " Secondary spatial observable Y: " << fSpatialObservableYSecondary << RESTendl;
RESTMetadata << "-----------------------------------------------" << RESTendl;
for (auto& i : fModulesCal) i.Print();
RESTMetadata << "***********************************************" << RESTendl;
Expand Down Expand Up @@ -729,6 +735,10 @@ void TRestDataSetGainMap::Module::GenerateGainMap() {
obsList.push_back(p->GetObservable());
obsList.push_back(p->GetSpatialObservableX());
obsList.push_back(p->GetSpatialObservableY());
if (!p->GetSpatialObservableXSecondary().empty())
obsList.push_back(p->GetSpatialObservableXSecondary());
if (!p->GetSpatialObservableYSecondary().empty())
obsList.push_back(p->GetSpatialObservableYSecondary());

// look for observables (characterized by having a _ in the name) in the definition cut
auto modDefCutObs = TRestTools::GetObservablesInString(fDefinitionCut, true);
Expand Down Expand Up @@ -831,6 +841,12 @@ void TRestDataSetGainMap::Module::GenerateGainMap() {
if (!GetSpatialObservableY().empty())
segment_cut += "&&" + GetSpatialObservableY() + ">=" + std::to_string(yLower) + "&&" +
GetSpatialObservableY() + "<" + std::to_string(yUpper);
if (!GetSpatialObservableXSecondary().empty())
segment_cut += "&&" + GetSpatialObservableXSecondary() + ">=" + std::to_string(xLower) +
"&&" + GetSpatialObservableXSecondary() + "<" + std::to_string(xUpper);
if (!GetSpatialObservableYSecondary().empty())
segment_cut += "&&" + GetSpatialObservableYSecondary() + ">=" + std::to_string(yLower) +
"&&" + GetSpatialObservableYSecondary() + "<" + std::to_string(yUpper);
if (!fDefinitionCut.empty()) segment_cut += "&&" + fDefinitionCut;
if (segment_cut.empty()) segment_cut = "1";
RESTExtreme << "Segment[" << i << "][" << j << "] cut: " << segment_cut << p->RESTendl;
Expand Down Expand Up @@ -1440,8 +1456,10 @@ void TRestDataSetGainMap::Module::DrawLinearFit(TCanvas* c) {
/// \param fullModuleAsRef If true, it will use the peak position at the full module spectrum
/// as reference for the gain map. If false, it will use the centered segment of the module
/// as reference.
/// \param showText If true, it will show the gain value in each segment.
///
void TRestDataSetGainMap::Module::DrawGainMap(const int peakNumber, bool fullModuleAsRef) {
void TRestDataSetGainMap::Module::DrawGainMap(const int peakNumber, const bool fullModuleAsRef,
const bool showText) {
if (peakNumber < 0 || peakNumber >= (int)fEnergyPeaks.size()) {
RESTError << "Peak number out of range (peakNumber should be between 0 and "
<< fEnergyPeaks.size() - 1 << " )" << p->RESTendl;
Expand Down Expand Up @@ -1493,7 +1511,9 @@ void TRestDataSetGainMap::Module::DrawGainMap(const int peakNumber, bool fullMod
hGainMap->SetStats(0);
hGainMap->Draw("colz");
hGainMap->SetBarOffset(0.2);
hGainMap->Draw("TEXT SAME");
if (showText) {
hGainMap->Draw("TEXT SAME");
}
}

/////////////////////////////////////////////
Expand Down