Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
54 commits
Select commit Hold shift + click to select a range
3aee0c3
troubleshooting trapping app
sophieehaight Mar 31, 2026
92c5d45
adapted trapping app to intake Cs-137 data and output lineshifts
sophieehaight Apr 3, 2026
c2bc846
changed fitting range around Cs line
sophieehaight Apr 15, 2026
c1f937a
added depth binning on pixel and detector level
sophieehaight May 4, 2026
e2b1c0a
added depth binning but need to remove pixel by pixel fitting
sophieehaight May 19, 2026
260fb35
added CTD binning and photopeak fits to LV and HV data
sophieehaight Jun 2, 2026
18e835a
fixed fit plotting and reading out CTD bins dn centroids to param txt…
sophieehaight Jun 2, 2026
53bb708
updated photopeak fit function w linear tail
sophieehaight Jun 3, 2026
f9a12c0
added output txt with spline fit for HV centroids
sophieehaight Jun 10, 2026
29b13f9
now output only returns HV energy root fits and comprehensive txt fit…
sophieehaight Jun 11, 2026
b9e11f3
added centroid error to spline readout txt
sophieehaight Jun 11, 2026
8bc3f4f
writes min and max CTD from data to splines txt file
sophieehaight Jun 17, 2026
3d970d3
adapted module for trapping correction, wrote function for sim input …
sophieehaight Jul 3, 2026
ae68931
Adapted header to trapping correction
sophieehaight Jul 3, 2026
acf6b1f
added params for sim cce input file
sophieehaight Jul 3, 2026
17cfbd6
added function for CCE corrected energy + interpolation helper function
sophieehaight Jul 3, 2026
b194068
updating hit energies with correction factor
sophieehaight Jul 3, 2026
124d92b
added LV CCE column to sim read in
sophieehaight Jul 3, 2026
46eb4b4
updated assembly files and removed GUI functionality
sophieehaight Jul 3, 2026
50177b3
correction compiles error free
sophieehaight Jul 3, 2026
e1d03e2
added fitting and param readout for HV strips
sophieehaight Jul 8, 2026
a383733
removed spline fitting and consolidated to one param file output
sophieehaight Jul 8, 2026
0f13cb3
fixed compilation error
sophieehaight Jul 8, 2026
8187914
added GUI options for input param file
sophieehaight Jul 9, 2026
34381ba
added expo with HV, LV photopeak plots
sophieehaight Jul 9, 2026
3f8f109
implemented finish function to return line shift and corrected res
sophieehaight Jul 14, 2026
a9327e5
resolved conflicts with HDF loader
sophieehaight Jul 14, 2026
b7c1cb7
cleaned up commented code
sophieehaight Jul 14, 2026
b8f1556
cleaned up more commented code
sophieehaight Jul 14, 2026
df25e2b
updated HDF loader header file
sophieehaight Jul 15, 2026
e1923d1
I'm just trying to get the HDF loader module up to date
sophieehaight Jul 15, 2026
5b3171e
fixed compiliation error
sophieehaight Jul 15, 2026
7bc061c
Merge branch 'Cs_trapping_branch' into trapping_correction_branch
sophieehaight Jul 15, 2026
40ff725
cleaned up commented code on trapping characterization app
sophieehaight Jul 23, 2026
ff21a0e
added dummy trapping parameter file to dee resource folder
sophieehaight Jul 23, 2026
8157795
removed duplicate functions from depth cal and reassigned them as pub…
sophieehaight Jul 24, 2026
d970075
fixed compilation error with trapping app
sophieehaight Jul 24, 2026
57a17db
removed duplicate code from trapping module and added depth cal gett…
sophieehaight Jul 24, 2026
a017321
cleaning out output from Cs trapping app
sophieehaight Jul 28, 2026
6c5153b
updated trapping parameter file w corrected base cce simulations
sophieehaight Jul 29, 2026
a48ef40
updated sim CCE read in function to take four raw simulated CCE curve…
sophieehaight Aug 5, 2026
8177668
updated function for corrected energy to scale HV,LV cce affected by …
sophieehaight Aug 5, 2026
30799b8
updated dummy trapping parameter file
sophieehaight Aug 6, 2026
f5426c5
added gaurd against nullptr for domminant strip energies
sophieehaight Aug 10, 2026
2f7b072
updated trapping param file to show depth in cm
sophieehaight Aug 10, 2026
cd9e879
added local position and corresponding getter/setter
sophieehaight Aug 10, 2026
c601dfa
write local position in depth cal and access local pos in trapping co…
sophieehaight Aug 10, 2026
2a10c00
added HV,LV photopeak fitting and readout at end of anlaysis
sophieehaight Aug 12, 2026
3a8b9f7
changed comment from mm to cm
sophieehaight Aug 12, 2026
fb8b087
added getter for expo histogram for outputting photopeak fit params
sophieehaight Aug 12, 2026
a480b75
updating trapping correction gui to compare corrected/uncorrected ene…
sophieehaight Aug 13, 2026
962421c
fixed hist inputted energy range + scaled peak height
sophieehaight Aug 16, 2026
cf10a9d
added outputted hist fit statistics
sophieehaight Aug 16, 2026
602bb63
Add charge trapping to the DEE
fhagemann Jul 28, 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
6 changes: 5 additions & 1 deletion apps/TrappingCorrectionAm241.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -274,13 +274,16 @@ bool TrappingCorrectionAm241::Analyze()
// Store the HV and LV input files
vector<MString> FileNames;
FileNames.push_back(m_HVFileName);
cout<<"HV file names stored"<<endl;
FileNames.push_back(m_LVFileName);
cout<<"LV file names stored"<<endl;

// Map the side integer to HV and LV labels
// i.e. 0=HV, 1=LV
vector<MString> IllumSide;
IllumSide.push_back(MString("HV"));
IllumSide.push_back(MString("LV"));
cout<<"HV and LV integers mapped"<<endl;

// Make a directory in which to store the pixel-level data
MString PixelDir = m_OutFile + MString("_pixeldata");
Expand Down Expand Up @@ -317,6 +320,7 @@ bool TrappingCorrectionAm241::Analyze()
// Read in the input files and make a list of hdf5 files to calibrate
if ((InputFile.GetSubString(InputFile.Length() - 4)) == "hdf5") {
HDFNames.push_back(InputFile);
cout<<"hdf names loaded correctly"<<endl;
} else if ((InputFile.GetSubString(InputFile.Length() - 3)) == "txt") {
cout<<"Reading input file "<<InputFile<<endl;
cout<<"WARNING: When passing a list of files, ensure that you have chosen the correct HDF5 continuous reading mode. Use the --nocontinue option to suppress continuous file reading."<<endl;
Expand Down Expand Up @@ -475,7 +479,7 @@ bool TrappingCorrectionAm241::Analyze()
MStripHit* HVSH = GetDominantStrip(HVStrips, HVEnergyFraction);
MStripHit* LVSH = GetDominantStrip(LVStrips, LVEnergyFraction);

if ((LVSH->HasCalibratedTiming()==true) && (HVSH->HasCalibratedTiming()==true)) {
if ((LVSH->HasCalibratedTiming()==true) && (HVSH->HasCalibratedTiming()==true)&& (LVSH != nullptr) && (HVSH != nullptr)) {

double CTD = LVSH->GetTiming() - HVSH->GetTiming();

Expand Down
Loading