Skip to content
Snippets Groups Projects

Draft: [mCBM] Digi filter around spill start in legacy unpacker

Open Pierre-Alain Loizeau requested to merge p.-a.loizeau/cbmroot:accevt_mcbm24_06Ur into master
Files
8
@@ -40,6 +40,7 @@ AccTimingEvent::AccTimingEvent(std::string sLine, bool bVerbose)
* | ///
* | /// Spill limits
* | /// 46 2E EVT_EXTR_START_SLOW Start of extraction
* | /// 49 31 EVT_EXTR_KICKER_START Start of extraction
* | /// 51 33 EVT_EXTR_END End of extraction
* | /// 78 4E EVT_EXTR_STOP_SLOW End of slow extraction
* | ///
@@ -49,19 +50,22 @@ AccTimingEvent::AccTimingEvent(std::string sLine, bool bVerbose)
* | uint32_t uEventNb = ((id >> 36) & 0xfff);
* | switch (uEventNb) {
* | case 32:
* | std::cout << " => EVT_START_CYCLE ";
* | std::cout << " => EVT_START_CYCLE ";
* | break;
* | case 55:
* | std::cout << " => EVT_END_CYCLE ";
* | std::cout << " => EVT_END_CYCLE ";
* | break;
* | case 46:
* | std::cout << " => EVT_EXTR_START_SLOW ";
* | std::cout << " => EVT_EXTR_START_SLOW ";
* | break;
* | case 49:
* | std::cout << " => EVT_EXTR_KICKER_START ";
* | break;
* | case 51:
* | std::cout << " => EVT_EXTR_END ";
* | std::cout << " => EVT_EXTR_END ";
* | break;
* | case 78:
* | std::cout << " => EVT_EXTR_STOP_SLOW ";
* | std::cout << " => EVT_EXTR_STOP_SLOW ";
* | break;
* | }
* | std::cout << tr_formatDate(deadline, pmode);
@@ -138,7 +142,7 @@ bool AccStatusTs::IsSpillOnAtTime(uint64_t uTimeUtc)
/// We start in the middle of an extraction spill
bSpillOn = false;
}
else if (!bSpillOn && it->IsExtractionStart()) {
else if (!bSpillOn && (it->IsExtractionStart() || it->IsKickerStart())) {
/// We start in the middle of an extraction spill
bSpillOn = true;
}
@@ -158,7 +162,7 @@ uint32_t AccStatusTs::GetSpillIdxAtTime(uint64_t uTimeUtc)
/// We start in the middle of an extraction spill
bSpillOn = false;
}
else if (!bSpillOn && it->IsExtractionStart()) {
else if (!bSpillOn && (it->IsExtractionStart() || it->IsKickerStart())) {
/// We start in the middle of an extraction spill
bSpillOn = true;
uSpillIdx++;
Loading