diff --git a/MQ/monitor/CbmDeviceMonitorPsd.h b/MQ/monitor/CbmDeviceMonitorPsd.h index 44c28213ccfb4ebed4420c679248ca1491f79ef6..27fb48a8bf8e5cffa95574a4974e938c508e1100 100644 --- a/MQ/monitor/CbmDeviceMonitorPsd.h +++ b/MQ/monitor/CbmDeviceMonitorPsd.h @@ -39,12 +39,12 @@ private: Bool_t fbComponentsAddedToList = kFALSE; /// Control flags - Bool_t fbMonitorMode; //! Switch ON the filling of a minimal set of histograms - Bool_t fbIgnoreOverlapMs; //! Ignore Overlap Ms: all fuOverlapMsNb MS at the end of timeslice - Bool_t fbMonitorChanMode; //! Switch ON the filling channelwise histograms - Bool_t fbMonitorWfmMode; //! Switch ON the filling waveforms histograms - Bool_t fbMonitorFitMode; //! Switch ON the filling waveform fitting histograms - Bool_t fbDebugMonitorMode; //! Switch ON the filling of a additional set of histograms + Bool_t fbMonitorMode; //! Switch ON the filling of a minimal set of histograms + Bool_t fbIgnoreOverlapMs; //! Ignore Overlap Ms: all fuOverlapMsNb MS at the end of timeslice + Bool_t fbMonitorChanMode; //! Switch ON the filling channelwise histograms + Bool_t fbMonitorWfmMode; //! Switch ON the filling waveforms histograms + Bool_t fbMonitorFitMode; //! Switch ON the filling waveform fitting histograms + // Bool_t fbDebugMonitorMode; //! Switch ON the filling of a additional set of histograms /// User settings parameters std::string fsChannelNameDataInput; diff --git a/core/data/raw/PsdGbtDataFormat-v1.00.h b/core/data/raw/PsdGbtDataFormat-v1.00.h index 9193d97f595785206d42f12a4d0ca97e93b3c5ef..0e413eac20f4761104deddd4b41b7fc51031402a 100644 --- a/core/data/raw/PsdGbtDataFormat-v1.00.h +++ b/core/data/raw/PsdGbtDataFormat-v1.00.h @@ -29,7 +29,10 @@ namespace PsdDataV100 uint8_t uEmpty0 : E0s; //! Empty bits uint64_t ulMicroSlice : MSs; //! Epoch - void printout() { printf("MS magic word: %x; microslice: %lu\n", uMagicWord, ulMicroSlice); } + void printout() + { + printf("MS magic word: %x; microslice: %llu\n", uMagicWord, static_cast<long long unsigned int>(ulMicroSlice)); + } void clear() { @@ -158,7 +161,7 @@ namespace PsdDataV100 uint64_t uEmpty0 : E0s; //! Empty bits - void printout() { printf("trailer: %lu\n", uEmpty0); } + void printout() { printf("trailer: %llu\n", static_cast<long long unsigned int>(uEmpty0)); } void clear() { uEmpty0 = 0; } diff --git a/fles/mcbm2018/monitor/CbmMcbm2018MonitorAlgoPsd.cxx b/fles/mcbm2018/monitor/CbmMcbm2018MonitorAlgoPsd.cxx index bb08e14b7c857323acf75c71667dd1020da0cff3..0d11bc05e9b778c06c0a8a4677eadd61dfa8e715 100644 --- a/fles/mcbm2018/monitor/CbmMcbm2018MonitorAlgoPsd.cxx +++ b/fles/mcbm2018/monitor/CbmMcbm2018MonitorAlgoPsd.cxx @@ -417,8 +417,8 @@ Bool_t CbmMcbm2018MonitorAlgoPsd::ProcessMs(const fles::Timeslice& ts, size_t uM auto const max_iter = std::max_element(uWfm.begin(), uWfm.end()); assert(max_iter != uWfm.end()); if (max_iter == uWfm.end()) break; - uint8_t hit_time_max = std::distance(uWfm.begin(), max_iter); - iHitAmlpitude = *max_iter - uZeroLevel; + // uint8_t hit_time_max = std::distance(uWfm.begin(), max_iter); + iHitAmlpitude = *max_iter - uZeroLevel; iHitAmlpitude /= kfAdc_to_mV; iHitChargeWfm /= kfAdc_to_mV; fvhHitAmplChan[uHitChannel]->Fill(iHitAmlpitude); @@ -573,11 +573,11 @@ Bool_t CbmMcbm2018MonitorAlgoPsd::ProcessMs(const fles::Timeslice& ts, size_t uM break; } - uint16_t uHitChannel = PsdReader.VectHitHdr.at(hit_iter).uHitChannel; - uint8_t uLinkIndex = PsdReader.VectPackHdr.at(hit_iter).uLinkIndex; + uint16_t uHitChannel = PsdReader.VectHitHdr.at(hit_iter).uHitChannel; + // uint8_t uLinkIndex = PsdReader.VectPackHdr.at(hit_iter).uLinkIndex; uint32_t uSignalCharge = PsdReader.VectHitHdr.at(hit_iter).uSignalCharge; uint16_t uZeroLevel = PsdReader.VectHitHdr.at(hit_iter).uZeroLevel; - double dHitTime = (double) fulCurrentMsIdx + PsdReader.VectPackHdr.at(hit_iter).uAdcTime * 12.5; //in ns + // double dHitTime = (double) fulCurrentMsIdx + PsdReader.VectPackHdr.at(hit_iter).uAdcTime * 12.5; //in ns //double dHitTime = PsdReader.MsHdr.ulMicroSlice*1000. + PsdReader.VectPackHdr.at(hit_iter).uAdcTime*12.5; //in ns std::vector<uint16_t> uWfm = PsdReader.VectHitData.at(hit_iter).uWfm; uSignalCharge /= kfAdc_to_mV; // ->now in mV @@ -609,8 +609,8 @@ Bool_t CbmMcbm2018MonitorAlgoPsd::ProcessMs(const fles::Timeslice& ts, size_t uM auto const max_iter = std::max_element(uWfm.begin(), uWfm.end()); assert(max_iter != uWfm.end()); if (max_iter == uWfm.end()) break; - uint8_t hit_time_max = std::distance(uWfm.begin(), max_iter); - iHitAmlpitude = *max_iter - uZeroLevel; + // uint8_t hit_time_max = std::distance(uWfm.begin(), max_iter); + iHitAmlpitude = *max_iter - uZeroLevel; iHitAmlpitude /= kfAdc_to_mV; iHitChargeWfm /= kfAdc_to_mV; fvhHitAmplChan[uHitChannel]->Fill(iHitAmlpitude); diff --git a/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoPsd.cxx b/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoPsd.cxx index abfc07f789c4cb68b626e751368790c06302fa57..b426221b4675f280a825ed78c44e834240ed66b6 100644 --- a/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoPsd.cxx +++ b/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoPsd.cxx @@ -432,8 +432,8 @@ Bool_t CbmMcbm2018UnpackerAlgoPsd::ProcessMs(const fles::Timeslice& ts, size_t u break; } - uint8_t uHitChannel = PsdReader.VectHitHdr.at(hit_iter).uHitChannel; - uint8_t uLinkIndex = PsdReader.VectPackHdr.at(hit_iter).uLinkIndex; + uint8_t uHitChannel = PsdReader.VectHitHdr.at(hit_iter).uHitChannel; + // uint8_t uLinkIndex = PsdReader.VectPackHdr.at(hit_iter).uLinkIndex; uint32_t uSignalCharge = PsdReader.VectHitHdr.at(hit_iter).uSignalCharge; uint16_t uZeroLevel = PsdReader.VectHitHdr.at(hit_iter).uZeroLevel; double dHitTime = (double) fulCurrentMsIdx + PsdReader.VectPackHdr.at(hit_iter).uAdcTime * 12.5; //in ns @@ -450,8 +450,8 @@ Bool_t CbmMcbm2018UnpackerAlgoPsd::ProcessMs(const fles::Timeslice& ts, size_t u assert(max_iter != uWfm.end()); if (max_iter == uWfm.end()) break; - uint8_t hit_time_max = std::distance(uWfm.begin(), max_iter); - iHitAmlpitude = *max_iter - uZeroLevel; + // uint8_t hit_time_max = std::distance(uWfm.begin(), max_iter); + iHitAmlpitude = *max_iter - uZeroLevel; } if (uHitChannel >= fviPsdChUId.size()) {