Skip to content

CHG: Update XML tags of EnergyCalibration and DepthCalibration #197

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
fhagemann wants to merge 2 commits into
base: develop/em
Choose a base branch
from
+19 −26
Open

CHG: Update XML tags of EnergyCalibration and DepthCalibration #197

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
cc58b0c
CHG: Update XML tags of `EnergyCalibration` and `DepthCalibration`
fhagemann Aug 18, 2026
89a1f13
ADD: Add remark on XML tags to `CodingConventions.md`
fhagemann Aug 18, 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
4 changes: 2 additions & 2 deletions CodingConventions.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,14 +37,14 @@ To format a file do the following:

## New classes

For new classes, copy and modify an existing one, or use the MModuleTemplate class as tempplate.
For new classes, copy and modify an existing one, or use the MModuleTemplate class as template.

## Naming

### Classes

* Due to historic reasons, all classes start with M.
* Modules start with MModule
* Modules start with MModule, with XML tags starting with XmlTag
* Option GUI's start with MGUIOptions
* Expo (= data display) GUI's start with MGUIExpo

Expand Down
11 changes: 2 additions & 9 deletions Config/Nuclearizer_EM_DEE.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,23 +73,16 @@
<MinimumStripPairingReducedChiSquare>-1</MinimumStripPairingReducedChiSquare>
<MaximumStripPairingReducedChiSquare>inf</MaximumStripPairingReducedChiSquare>
</XmlTagEventFilter>
<EnergyCalibration>
<XmlTagEnergyCalibration>
<FileName />
<SlowThresholdCutMode>0</SlowThresholdCutMode>
<SlowThresholdCutFixedValue>15</SlowThresholdCutFixedValue>
<SlowThresholdCutThresholdFileName />
<NearestNeighborCutMode>100</NearestNeighborCutMode>
<NearestNeighborThreshold>-1000</NearestNeighborThreshold>
</EnergyCalibration>
</XmlTagEnergyCalibration>
<XmlTagStripPairingMultiRoundChiSquare />
<XmlTagStripPairingChiSquare />
<DepthCalibration>
<CoeffsFileName />
<SplinesFileName />
<MaskMetrology>true</MaskMetrology>
<MaskMetrologyFileName />
<UCSDOverride>true</UCSDOverride>
</DepthCalibration>
<XmlTagEventSaver>
<FileName>/Users/parshadkp/Library/CloudStorage/OneDrive-ClemsonUniversity/COSI/nuclearizer_files/nuclearizer_outputs/STTC/STTC_DEE_Cs137.evta</FileName>
<Mode>2</Mode>
Expand Down
12 changes: 6 additions & 6 deletions resource/unittestdata/406-1/hdf5-to-tra.nuclearizer.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
<Version>1</Version>
<ModuleSequence>
<ModuleSequenceItem>XmlTagMeasurementLoaderHDF</ModuleSequenceItem>
<ModuleSequenceItem>EnergyCalibration</ModuleSequenceItem>
<ModuleSequenceItem>XmlTagEnergyCalibration</ModuleSequenceItem>
<ModuleSequenceItem>XmlTagTACcut</ModuleSequenceItem>
<ModuleSequenceItem>XmlTagStripPairingMultiRoundChiSquare</ModuleSequenceItem>
<ModuleSequenceItem>DepthCalibration</ModuleSequenceItem>
<ModuleSequenceItem>XmlTagDepthCalibration</ModuleSequenceItem>
<ModuleSequenceItem>XmlTagRevan</ModuleSequenceItem>
<ModuleSequenceItem>XmlTagEventSaver</ModuleSequenceItem>
</ModuleSequence>
Expand All @@ -17,22 +17,22 @@
<FileNameStripMap>$(NUCLEARIZER)/resource/unittestdata/406-1/hp52406-1.stripmap.map</FileNameStripMap>
<IncludeNearestNeighbor>false</IncludeNearestNeighbor>
</XmlTagMeasurementLoaderHDF>
<EnergyCalibration>
<XmlTagEnergyCalibration>
<FileName>$(NUCLEARIZER)/resource/unittestdata/406-1/hp52406-1.full.ecal</FileName>
<SlowThresholdCutMode>1</SlowThresholdCutMode>
<SlowThresholdCutFixedValue>20</SlowThresholdCutFixedValue>
<SlowThresholdCutThresholdFileName />
<NearestNeighborCutMode>100</NearestNeighborCutMode>
<NearestNeighborThreshold>-1000</NearestNeighborThreshold>
</EnergyCalibration>
</XmlTagEnergyCalibration>
<XmlTagStripPairingMultiRoundChiSquare />
<DepthCalibration>
<XmlTagDepthCalibration>
<CoeffsFileName>$(NUCLEARIZER)/resource/unittestdata/406-1/hp52406-1.coeffs.csv</CoeffsFileName>
<SplinesFileName>$(NUCLEARIZER)/resource/unittestdata/406-1/hp52406-1.splines.csv</SplinesFileName>
<MaskMetrology>false</MaskMetrology>
<MaskMetrologyFileName />
<UCSDOverride>false</UCSDOverride>
</DepthCalibration>
</XmlTagDepthCalibration>
<XmlTagEventSaver>
<FileName>$(NUCLEARIZER)/resource/unittestdata/406-1/hdf5-to-tra.tra</FileName>
<Mode>3</Mode>
Expand Down
12 changes: 6 additions & 6 deletions resource/unittestdata/542-1/hdf5-to-tra.nuclearizer.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
<Version>1</Version>
<ModuleSequence>
<ModuleSequenceItem>XmlTagMeasurementLoaderHDF</ModuleSequenceItem>
<ModuleSequenceItem>EnergyCalibration</ModuleSequenceItem>
<ModuleSequenceItem>XmlTagEnergyCalibration</ModuleSequenceItem>
<ModuleSequenceItem>XmlTagTACcut</ModuleSequenceItem>
<ModuleSequenceItem>XmlTagStripPairingMultiRoundChiSquare</ModuleSequenceItem>
<ModuleSequenceItem>DepthCalibration</ModuleSequenceItem>
<ModuleSequenceItem>XmlTagDepthCalibration</ModuleSequenceItem>
<ModuleSequenceItem>XmlTagRevan</ModuleSequenceItem>
<ModuleSequenceItem>XmlTagEventSaver</ModuleSequenceItem>
</ModuleSequence>
Expand All @@ -17,22 +17,22 @@
<FileNameStripMap>$(NUCLEARIZER)/resource/unittestdata/542-1/hp52542-1.stripmap.map</FileNameStripMap>
<IncludeNearestNeighbor>false</IncludeNearestNeighbor>
</XmlTagMeasurementLoaderHDF>
<EnergyCalibration>
<XmlTagEnergyCalibration>
<FileName>$(NUCLEARIZER)/resource/unittestdata/542-1/hp52542-1.full.ecal</FileName>
<SlowThresholdCutMode>1</SlowThresholdCutMode>
<SlowThresholdCutFixedValue>20</SlowThresholdCutFixedValue>
<SlowThresholdCutThresholdFileName />
<NearestNeighborCutMode>100</NearestNeighborCutMode>
<NearestNeighborThreshold>-1000</NearestNeighborThreshold>
</EnergyCalibration>
</XmlTagEnergyCalibration>
<XmlTagStripPairingMultiRoundChiSquare />
<DepthCalibration>
<XmlTagDepthCalibration>
<CoeffsFileName>$(NUCLEARIZER)/resource/unittestdata/542-1/hp52542-1.coeffs.csv</CoeffsFileName>
<SplinesFileName>$(NUCLEARIZER)/resource/unittestdata/542-1/hp52542-1.splines.csv</SplinesFileName>
<MaskMetrology>false</MaskMetrology>
<MaskMetrologyFileName />
<UCSDOverride>false</UCSDOverride>
</DepthCalibration>
</XmlTagDepthCalibration>
<XmlTagEventSaver>
<FileName>$(NUCLEARIZER)/resource/unittestdata/542-1/hdf5-to-tra.tra</FileName>
<Mode>3</Mode>
Expand Down
4 changes: 2 additions & 2 deletions src/MModuleDepthCalibration.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ MModuleDepthCalibration::MModuleDepthCalibration() : MModule()
m_Name = "Depth Calibration"; // - Determining the depth of each event (by Sean);

// Set the XML tag --- has to be unique --- no spaces allowed
m_XmlTag = "DepthCalibration";
m_XmlTag = "XmlTagDepthCalibration";

// Set all modules, which have to be done before this module
AddPreceedingModuleType(MAssembly::c_EnergyCalibration, true);
Expand Down Expand Up @@ -142,7 +142,7 @@ bool MModuleDepthCalibration::Initialize()
}

MSupervisor* S = MSupervisor::GetSupervisor();
m_EnergyCalibration = (MModuleEnergyCalibration*) S->GetAvailableModuleByXmlTag("EnergyCalibration");
m_EnergyCalibration = (MModuleEnergyCalibration*) S->GetAvailableModuleByXmlTag("XmlTagEnergyCalibration");
if (m_EnergyCalibration == nullptr) {
cout << "MModuleDepthCalibration: couldn't resolve pointer to Energy Calibration Module... need access to this module for energy resolution lookup!" << endl;
return false;
Expand Down
2 changes: 1 addition & 1 deletion src/MModuleEnergyCalibration.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ MModuleEnergyCalibration::MModuleEnergyCalibration() : MModule()
m_Name = "Energy calibrator";

// Set the XML tag --- has to be unique --- no spaces allowed
m_XmlTag = "EnergyCalibration";
m_XmlTag = "XmlTagEnergyCalibration";

// Set all modules, which have to be done before this module
AddPreceedingModuleType(MAssembly::c_EventLoader);
Expand Down
Loading