Skip to content

BugFix in EBV2 Toolchain #390

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
anuj-guptta wants to merge 2 commits into
base: Application
Choose a base branch
from
Open

BugFix in EBV2 Toolchain #390

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
eaf92a0
Fix incorrect offset indexing during offset saving
anuj-guptta Jul 3, 2026
6b1763b
BugFix in EBLAPPD
anuj-guptta Aug 12, 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 UserTools/EBLAPPD/EBLAPPD.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,8 +210,8 @@ bool EBLAPPD::LoadLAPPDData()
LAPPDOffset = 0;
m_data->CStore.Get("LAPPDOffset", LAPPDOffset);

LAPPDBeamgate_ns = LAPPDBeamgate_ns + LAPPDBGCorrection + LAPPDOffset;
LAPPDTimestamp_ns = LAPPDTimestamp_ns + LAPPDTSCorrection + LAPPDOffset;
LAPPDBeamgate_ns = LAPPDBeamgate_ns + LAPPDBGCorrection*3.125 + LAPPDOffset;
LAPPDTimestamp_ns = LAPPDTimestamp_ns + LAPPDTSCorrection*3.125 + LAPPDOffset;

LAPPDBG_PPSBefore = 0;
LAPPDBG_PPSAfter = 0;
Expand Down
38 changes: 31 additions & 7 deletions UserTools/LAPPDLoadStore/LAPPDLoadStore.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ bool LAPPDLoadStore::Initialise(std::string configfile, DataModel &data)
LAPPDEventIndex_ID = {0, 0, 0, 0, 0}; // initialize for five LAPPDs
if (loadOffsets)
LoadOffsetsAndCorrections();
if (LAPPDStoreReadInVerbosity > 11)
if (LAPPDStoreReadInVerbosity > 5)
debugStoreReadIn.open("debugStoreReadIn.txt");

std::string ACCIDConfigFile;
Expand Down Expand Up @@ -347,7 +347,7 @@ bool LAPPDLoadStore::Execute()
m_data->Stores["ANNIEEvent"]->Set("ReadedBoards", ReadedBoards);

m_data->CStore.Set("NewLAPPDDataAvailable", true);
if (LAPPDStoreReadInVerbosity > 11)
if (LAPPDStoreReadInVerbosity > 5)
debugStoreReadIn << " Set NewLAPPDDataAvailable to true" << endl;

NonEmptyEvents += 1;
Expand Down Expand Up @@ -1336,8 +1336,16 @@ void LAPPDLoadStore::SaveTimeStamps()
m_data->Stores["ANNIEEvent"]->Set("LAPPDBeamgate_Raw", beamgate_63_0);
m_data->Stores["ANNIEEvent"]->Set("LAPPDTimestamp_Raw", timestamp_63_0);

if (LAPPDStoreReadInVerbosity > 11)
debugStoreReadIn << eventNo << " LAPPDStoreReadIn, Saving timestamps, beamgate_timestamp: " << beamgate_63_0 << ", lappd_timestamp: " << timestamp_63_0 << endl;
if (LAPPDStoreReadInVerbosity > 5) {
debugStoreReadIn
<< "Event number: " << eventNo
<< ", LAPPD ID: " << LAPPD_ID
<< ", PSEC index: " << LAPPDEventIndex_ID[LAPPD_ID]
<< ", PPS index: " << PPSnumber
<< ", Timestamp: " << timestamp_63_0
<< ", Beamgate: " << beamgate_63_0
<< std::endl;
}

if (loadOffsets && runInfoLoaded)
{
Expand All @@ -1346,6 +1354,7 @@ void LAPPDLoadStore::SaveTimeStamps()
// search it in the maps, then load
SaveOffsets();
}

m_data->CStore.Set("LAPPD_new_event", true);
}

Expand All @@ -1356,7 +1365,8 @@ void LAPPDLoadStore::SaveOffsets()
{
LAPPDEventIndex_ID.resize(LoadingOffsetID+1);
}
int GetOffsetIndex_byID = LAPPDEventIndex_ID[LoadingOffsetID];
int GetOffsetIndex_byID = LAPPDEventIndex_ID[LoadingOffsetID] - 1;

if(LAPPDStoreReadInVerbosity>0)
cout << "LAPPDStoreReadIn, SavingOffsets, LoadingOffset for LAPPD_ID: " << LoadingOffsetID << ", OffsetIndex of this event: " << GetOffsetIndex_byID << endl;

Expand Down Expand Up @@ -1560,8 +1570,22 @@ void LAPPDLoadStore::SaveOffsets()

// cout << "LAPPDStoreReadIn, Saving offsets and corrections, key: " << key << ", LAPPDOffset: " << LAPPDOffset << ", LAPPDOffset_minus_ps: " << LAPPDOffset_minus_ps << ", LAPPDBGCorrection: " << LAPPDBGCorrection << ", LAPPDTSCorrection: " << LAPPDTSCorrection << ", BG_PPSBefore: " << BG_PPSBefore << ", BG_PPSAfter: " << BG_PPSAfter << ", BG_PPSDiff: " << BG_PPSDiff << ", BG_PPSMissing: " << BG_PPSMissing << ", TS_PPSBefore: " << TS_PPSBefore << ", TS_PPSAfter: " << TS_PPSAfter << ", TS_PPSDiff: " << TS_PPSDiff << ", TS_PPSMissing: " << TS_PPSMissing << endl;

if (LAPPDStoreReadInVerbosity > 11)
debugStoreReadIn << eventNo << "+LAPPDStoreReadIn, Saving offsets and corrections, key: " << key << ", LAPPDOffset: " << LAPPDOffset << ", LAPPDOffset_minus_ps: " << LAPPDOffset_minus_ps << ", LAPPDBGCorrection: " << LAPPDBGCorrection << ", LAPPDTSCorrection: " << LAPPDTSCorrection << endl;
if (LAPPDStoreReadInVerbosity > 5) {
debugStoreReadIn
<< "Event number: " << eventNo
<< ", LAPPDStoreReadIn, Saving offsets, key: " << key
<< ", LAPPD_ID: " << LAPPD_ID
<< ", idx: " << GetOffsetIndex_byID
<< ", TS_PPSBefore: " << TS_PPSBefore
<< ", BG_PPSBefore: " << BG_PPSBefore
<< ", TS_PPSAfter: " << TS_PPSAfter
<< ", BG_PPSAfter: " << BG_PPSAfter
<< ", LAPPDOffset: " << LAPPDOffset
<< ", LAPPDOffset_minus_ps: " << LAPPDOffset_minus_ps
<< ", LAPPDTSCorrection: " << LAPPDTSCorrection
<< ", LAPPDBGCorrection: " << LAPPDBGCorrection
<< std::endl;
}
}

void LAPPDLoadStore::LoadOffsetsAndCorrections()
Expand Down
Loading