Skip to content
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

Properly set TAGH energy based on current geometry #764

Merged
merged 2 commits into from
Dec 1, 2023
Merged

Properly set TAGH energy based on current geometry #764

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3a9c3fa
Properly set TAGH energy based on current geometry
sdobbs Nov 13, 2023
2298aac
moved new() statements around to avoid potential memory leaks
sdobbs Nov 30, 2023
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
24 changes: 14 additions & 10 deletions src/libraries/HDDM/DEventSourceREST.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -620,8 +620,6 @@ jerror_t DEventSourceREST::Extract_DBeamPhoton(hddm_r::HDDM *record,
{
if (locTAGMiter->getJtag() != tag)
continue;

DBeamPhoton* gamma = new DBeamPhoton();

// load the counter number (if it exists) and set the energy based on the counter
unsigned int column = 0;
Expand Down Expand Up @@ -654,12 +652,14 @@ jerror_t DEventSourceREST::Extract_DBeamPhoton(hddm_r::HDDM *record,
continue;
}

double Elo = tagmGeom->getElow(column);
double Ehi = tagmGeom->getEhigh(column);
double Ebeam = (Elo + Ehi)/2.;
DBeamPhoton* gamma = new DBeamPhoton();

double Elo_tagm = tagmGeom->getElow(column);
double Ehi_tagm = tagmGeom->getEhigh(column);
double Ebeam_tagm = (Elo_tagm + Ehi_tagm)/2.;

// read the rest of the data from the REST file
DVector3 mom(0.0, 0.0, Ebeam);
DVector3 mom(0.0, 0.0, Ebeam_tagm);
gamma->setPID(Gamma);
gamma->setMomentum(mom);
gamma->setPosition(pos);
Expand All @@ -682,16 +682,14 @@ jerror_t DEventSourceREST::Extract_DBeamPhoton(hddm_r::HDDM *record,
if (locTAGHiter->getJtag() != tag)
continue;

DBeamPhoton* gamma = new DBeamPhoton();

// load the counter number (if it exists) and set the energy based on the counter
unsigned int counter = 0;
hddm_r::TaghChannelList &locTaghChannelList = locTAGHiter->getTaghChannels();
if (locTaghChannelList.size() > 0) {
// it's easy if the column is already set
counter = locTaghChannelList().getCounter();
} else {
// if the TAGM column isn't saved in the REST file, then we do one of two things
// if the TAGH column isn't saved in the REST file, then we do one of two things
// 1) if there's no special CCDB context associated with the file, we can just
// reverse engineer the counter, assuming the latest CCDB
// 2) If there is a special CCDB context specified, then use that instead
Expand All @@ -715,7 +713,13 @@ jerror_t DEventSourceREST::Extract_DBeamPhoton(hddm_r::HDDM *record,
continue;
}

DVector3 mom(0.0, 0.0, locTAGHiter->getE());
DBeamPhoton* gamma = new DBeamPhoton();

double Elo_tagh = taghGeom->getElow(counter);
double Ehi_tagh = taghGeom->getEhigh(counter);
double Ebeam_tagh = (Elo_tagh + Ehi_tagh)/2.;

DVector3 mom(0.0, 0.0, Ebeam_tagh);
gamma->setPID(Gamma);
gamma->setMomentum(mom);
gamma->setPosition(pos);
Expand Down