diff --git a/fles/mcbm2018/monitor/CbmMcbm2018MonitorAlgoMuchLite.cxx b/fles/mcbm2018/monitor/CbmMcbm2018MonitorAlgoMuchLite.cxx index 40c9bad9b2bda89bb3dba6f980f83a8e450c53b6..10901456f7ee585877b9786519435893eca3eb29 100644 --- a/fles/mcbm2018/monitor/CbmMcbm2018MonitorAlgoMuchLite.cxx +++ b/fles/mcbm2018/monitor/CbmMcbm2018MonitorAlgoMuchLite.cxx @@ -35,8 +35,8 @@ #include <stdint.h> -/*Bool_t bMcbmResetAlgoMuchLite = kFALSE; - Bool_t bMcbm2018WriteAlgoMuchLite = kFALSE; +/*Bool_t bMcbmResetAlgoMuchLite = kFALSE; + Bool_t bMcbm2018WriteAlgoMuchLite = kFALSE; Bool_t bMcbm2018ScanNoisyAlgoMuchLite = kFALSE;*/ CbmMcbm2018MonitorAlgoMuchLite::CbmMcbm2018MonitorAlgoMuchLite() @@ -301,48 +301,48 @@ Bool_t CbmMcbm2018MonitorAlgoMuchLite::InitMuchParameters() return kTRUE; } -/* void CbmMcbm2018MonitorAlgoMuchLite::SetNbMsInTs(size_t uCoreMsNb, - size_t uOverlapMsNb) { - fuNbCoreMsPerTs = uCoreMsNb; - fuNbOverMsPerTs = uOverlapMsNb; - //LOG(info) <<" fuNbCoreMsPerTs "<<fuNbCoreMsPerTs<<" fuNbOverMsPerTs "<<fuNbOverMsPerTs; - UInt_t uNbMsTotal = fuNbCoreMsPerTs + fuNbOverMsPerTs; - - if (fuMaxNbMicroslices < uNbMsTotal) { - fuMaxNbMicroslices = uNbMsTotal; - fvdMsTime.resize(fuMaxNbMicroslices); - fvuChanNbHitsInMs.resize(fuNbStsXyters); - fvdChanLastHitTimeInMs.resize(fuNbStsXyters); - fvusChanLastHitAdcInMs.resize(fuNbStsXyters); - for (UInt_t uXyterIdx = 0; uXyterIdx < fuNbStsXyters; ++uXyterIdx) { - fvuChanNbHitsInMs[uXyterIdx].resize(fUnpackParMuch->GetNbChanPerAsic()); - fvdChanLastHitTimeInMs[uXyterIdx].resize( - fUnpackParMuch->GetNbChanPerAsic()); - fvusChanLastHitAdcInMs[uXyterIdx].resize( - fUnpackParMuch->GetNbChanPerAsic()); - for (UInt_t uChan = 0; uChan < fUnpackParMuch->GetNbChanPerAsic(); - ++uChan) { - fvuChanNbHitsInMs[uXyterIdx][uChan].resize(fuMaxNbMicroslices); - fvdChanLastHitTimeInMs[uXyterIdx][uChan].resize(fuMaxNbMicroslices); - fvusChanLastHitAdcInMs[uXyterIdx][uChan].resize(fuMaxNbMicroslices); - for (UInt_t uMsIdx = 0; uMsIdx < fuMaxNbMicroslices; ++uMsIdx) { - fvuChanNbHitsInMs[uXyterIdx][uChan][uMsIdx] = 0; - fvdChanLastHitTimeInMs[uXyterIdx][uChan][uMsIdx] = -1.0; - fvusChanLastHitAdcInMs[uXyterIdx][uChan][uMsIdx] = 0; - LOG(info) << "CbmMcbm2018MonitorMuchLite::DoUnpack => Changed " - "fvuChanNbHitsInMs size " - << fvuChanNbHitsInMs.size() << " VS " << fuNbStsXyters; - LOG(info) << "CbmMcbm2018MonitorMuchLite::DoUnpack => Changed " - "fvuChanNbHitsInMs size " - << fvuChanNbHitsInMs[0].size() << " VS " - << fUnpackParMuch->GetNbChanPerAsic(); - LOG(info) << "CbmMcbm2018MonitorMuchLite::DoUnpack => Changed " - "fvuChanNbHitsInMs size " - << fvuChanNbHitsInMs[0][0].size() << " VS " << fuMaxNbMicroslices; - } // if( fuMaxNbMicroslices < uNbMsTotal ) - } - } - } +/* void CbmMcbm2018MonitorAlgoMuchLite::SetNbMsInTs(size_t uCoreMsNb, + size_t uOverlapMsNb) { + fuNbCoreMsPerTs = uCoreMsNb; + fuNbOverMsPerTs = uOverlapMsNb; + //LOG(info) <<" fuNbCoreMsPerTs "<<fuNbCoreMsPerTs<<" fuNbOverMsPerTs "<<fuNbOverMsPerTs; + UInt_t uNbMsTotal = fuNbCoreMsPerTs + fuNbOverMsPerTs; + + if (fuMaxNbMicroslices < uNbMsTotal) { + fuMaxNbMicroslices = uNbMsTotal; + fvdMsTime.resize(fuMaxNbMicroslices); + fvuChanNbHitsInMs.resize(fuNbStsXyters); + fvdChanLastHitTimeInMs.resize(fuNbStsXyters); + fvusChanLastHitAdcInMs.resize(fuNbStsXyters); + for (UInt_t uXyterIdx = 0; uXyterIdx < fuNbStsXyters; ++uXyterIdx) { + fvuChanNbHitsInMs[uXyterIdx].resize(fUnpackParMuch->GetNbChanPerAsic()); + fvdChanLastHitTimeInMs[uXyterIdx].resize( + fUnpackParMuch->GetNbChanPerAsic()); + fvusChanLastHitAdcInMs[uXyterIdx].resize( + fUnpackParMuch->GetNbChanPerAsic()); + for (UInt_t uChan = 0; uChan < fUnpackParMuch->GetNbChanPerAsic(); + ++uChan) { + fvuChanNbHitsInMs[uXyterIdx][uChan].resize(fuMaxNbMicroslices); + fvdChanLastHitTimeInMs[uXyterIdx][uChan].resize(fuMaxNbMicroslices); + fvusChanLastHitAdcInMs[uXyterIdx][uChan].resize(fuMaxNbMicroslices); + for (UInt_t uMsIdx = 0; uMsIdx < fuMaxNbMicroslices; ++uMsIdx) { + fvuChanNbHitsInMs[uXyterIdx][uChan][uMsIdx] = 0; + fvdChanLastHitTimeInMs[uXyterIdx][uChan][uMsIdx] = -1.0; + fvusChanLastHitAdcInMs[uXyterIdx][uChan][uMsIdx] = 0; + LOG(info) << "CbmMcbm2018MonitorMuchLite::DoUnpack => Changed " + "fvuChanNbHitsInMs size " + << fvuChanNbHitsInMs.size() << " VS " << fuNbStsXyters; + LOG(info) << "CbmMcbm2018MonitorMuchLite::DoUnpack => Changed " + "fvuChanNbHitsInMs size " + << fvuChanNbHitsInMs[0].size() << " VS " + << fUnpackParMuch->GetNbChanPerAsic(); + LOG(info) << "CbmMcbm2018MonitorMuchLite::DoUnpack => Changed " + "fvuChanNbHitsInMs size " + << fvuChanNbHitsInMs[0][0].size() << " VS " << fuMaxNbMicroslices; + } // if( fuMaxNbMicroslices < uNbMsTotal ) + } + } + } } */ @@ -492,40 +492,40 @@ Bool_t CbmMcbm2018MonitorAlgoMuchLite::CreateHistograms() fhMuchHitsElinkPerDpb = new TH2I(sHistName, title, fuNrOfDpbs, 0, fuNrOfDpbs, 42, 0., 42.); LOG(debug) << "Initialized 2nd Histo"; - /* - // Number of rate bins = - // 9 for the sub-unit decade - // + 9 for each unit of each decade * 10 for the subdecade range - // + 1 for the closing bin top edge - const Int_t iNbDecadesRate = 9; - const Int_t iNbStepsDecade = 9; - const Int_t iNbSubStepsInStep = 10; - const Int_t iNbBinsRate = iNbStepsDecade - + iNbStepsDecade * iNbSubStepsInStep * iNbDecadesRate - + 1; - Double_t dBinsRate[iNbBinsRate]; - // First fill sub-unit decade - for( Int_t iSubU = 0; iSubU < iNbStepsDecade; iSubU ++ ) - dBinsRate[ iSubU ] = 0.1 * ( 1 + iSubU ); - std::cout << std::endl; - // Then fill the main decades - Double_t dSubstepSize = 1.0 / iNbSubStepsInStep; - for( Int_t iDecade = 0; iDecade < iNbDecadesRate; iDecade ++) - { - Double_t dBase = std::pow( 10, iDecade ); - Int_t iDecadeIdx = iNbStepsDecade - + iDecade * iNbStepsDecade * iNbSubStepsInStep; - for( Int_t iStep = 0; iStep < iNbStepsDecade; iStep++ ) - { - Int_t iStepIdx = iDecadeIdx + iStep * iNbSubStepsInStep; - for( Int_t iSubStep = 0; iSubStep < iNbSubStepsInStep; iSubStep++ ) - { - dBinsRate[ iStepIdx + iSubStep ] = dBase * (1 + iStep) - + dBase * dSubstepSize * iSubStep; - } // for( Int_t iSubStep = 0; iSubStep < iNbSubStepsInStep; iSubStep++ ) - } // for( Int_t iStep = 0; iStep < iNbStepsDecade; iStep++ ) - } // for( Int_t iDecade = 0; iDecade < iNbDecadesRate; iDecade ++) - dBinsRate[ iNbBinsRate - 1 ] = std::pow( 10, iNbDecadesRate ); + /* + // Number of rate bins = + // 9 for the sub-unit decade + // + 9 for each unit of each decade * 10 for the subdecade range + // + 1 for the closing bin top edge + const Int_t iNbDecadesRate = 9; + const Int_t iNbStepsDecade = 9; + const Int_t iNbSubStepsInStep = 10; + const Int_t iNbBinsRate = iNbStepsDecade + + iNbStepsDecade * iNbSubStepsInStep * iNbDecadesRate + + 1; + Double_t dBinsRate[iNbBinsRate]; + // First fill sub-unit decade + for( Int_t iSubU = 0; iSubU < iNbStepsDecade; iSubU ++ ) + dBinsRate[ iSubU ] = 0.1 * ( 1 + iSubU ); + std::cout << std::endl; + // Then fill the main decades + Double_t dSubstepSize = 1.0 / iNbSubStepsInStep; + for( Int_t iDecade = 0; iDecade < iNbDecadesRate; iDecade ++) + { + Double_t dBase = std::pow( 10, iDecade ); + Int_t iDecadeIdx = iNbStepsDecade + + iDecade * iNbStepsDecade * iNbSubStepsInStep; + for( Int_t iStep = 0; iStep < iNbStepsDecade; iStep++ ) + { + Int_t iStepIdx = iDecadeIdx + iStep * iNbSubStepsInStep; + for( Int_t iSubStep = 0; iSubStep < iNbSubStepsInStep; iSubStep++ ) + { + dBinsRate[ iStepIdx + iSubStep ] = dBase * (1 + iStep) + + dBase * dSubstepSize * iSubStep; + } // for( Int_t iSubStep = 0; iSubStep < iNbSubStepsInStep; iSubStep++ ) + } // for( Int_t iStep = 0; iStep < iNbStepsDecade; iStep++ ) + } // for( Int_t iDecade = 0; iDecade < iNbDecadesRate; iDecade ++) + dBinsRate[ iNbBinsRate - 1 ] = std::pow( 10, iNbDecadesRate ); */ LOG(debug) << "Initialized 3rd Histo"; ///++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++/// @@ -744,9 +744,9 @@ Bool_t CbmMcbm2018MonitorAlgoMuchLite::CreateHistograms() // server->Register("/MuchFeb", fhMuchFebHitRateEvo_mskch_adccut[ uFebIdx ] ); // server->Register("/MuchFeb", fhMuchFebHitRateEvo_WithoutDupli[ uFebIdx ] ); LOG(debug) << "Initialized fhMuchFebHitRateEvo_WithoutDupli number " << uFebIdx; - /*server->Register("/MuchFeb", fhMuchFebChanHitRateEvoLong[ uFebIdx ] ); - server->Register("/MuchFeb", fhMuchFebAsicHitRateEvoLong[ uFebIdx ] ); - server->Register("/MuchFeb", fhMuchFebHitRateEvoLong[ uFebIdx ] ); + /*server->Register("/MuchFeb", fhMuchFebChanHitRateEvoLong[ uFebIdx ] ); + server->Register("/MuchFeb", fhMuchFebAsicHitRateEvoLong[ uFebIdx ] ); + server->Register("/MuchFeb", fhMuchFebHitRateEvoLong[ uFebIdx ] ); server->Register("/MuchFeb", fhMuchFebChanDistT[ uFebIdx ] );*/ } // if( kTRUE == fUnpackParMuch->IsFebActive( uFebIdx ) ) @@ -755,11 +755,11 @@ Bool_t CbmMcbm2018MonitorAlgoMuchLite::CreateHistograms() } // for( UInt_t uFebIdx = 0; uFebIdx < fuNbFebs; ++uFebIdx ) // LOG(debug) << "Initialized FEB 8th Histo"; - /*server->RegisterCommand("/Reset_All", "bMcbm2018ResetAlgoMuchLite=kTRUE"); - server->RegisterCommand("/Write_All", "bMcbm2018WriteAlgoMuchLite=kTRUE"); - server->RegisterCommand("/ScanNoisyCh", "bMcbm2018ScanNoisyAlgoMuchLite=kTRUE"); - server->Restrict("/Reset_All", "allow=admin"); - server->Restrict("/Write_All", "allow=admin"); + /*server->RegisterCommand("/Reset_All", "bMcbm2018ResetAlgoMuchLite=kTRUE"); + server->RegisterCommand("/Write_All", "bMcbm2018WriteAlgoMuchLite=kTRUE"); + server->RegisterCommand("/ScanNoisyCh", "bMcbm2018ScanNoisyAlgoMuchLite=kTRUE"); + server->Restrict("/Reset_All", "allow=admin"); + server->Restrict("/Write_All", "allow=admin"); server->Restrict("/ScanNoisyCh", "allow=admin"); */ // } // if( server ) @@ -899,23 +899,23 @@ Bool_t CbmMcbm2018MonitorAlgoMuchLite::ProcessTs(const fles::Timeslice& ts) } // if( kFALSE == ProcessMs( ts, uMsCompIdx, fuMsIndex ) ) // LOG(info) << "TS index : " << fulCurrentTsIdx << " end processing MS"; } // for( UInt_t uMsCompIdx = 0; uMsCompIdx < fvMsComponentsList.size(); ++uMsCompIdx ) - /* - /// Sort the buffers of hits - std::sort( fvmHitsInMs.begin(), fvmHitsInMs.end() ); - - /// Add the hits to the output buffer as Digis - for( auto itHitIn = fvmHitsInMs.begin(); itHitIn < fvmHitsInMs.end(); ++itHitIn ) - { - UInt_t uFebIdx = itHitIn->GetAsic() / fUnpackPar->GetNbAsicsPerFeb() - + ( itHitIn->GetDpb() * fUnpackPar->GetNbCrobsPerDpb() + itHitIn->GetCrob() ) - * fUnpackPar->GetNbFebsPerCrob(); - UInt_t uChanInFeb = itHitIn->GetChan() - + fUnpackPar->GetNbChanPerAsic() * (itHitIn->GetAsic() % fUnpackPar->GetNbAsicsPerFeb()); - - ULong64_t ulTimeInNs = static_cast< ULong64_t >( itHitIn->GetTs() * stsxyter::kdClockCycleNs - fdTimeOffsetNs ); - - fDigiVect.push_back( CbmTofDigi( fviFebAddress[ uFebIdx ], uChanInFeb, ulTimeInNs, itHitIn->GetAdc() ) ); - } // for( auto itHitIn = fvmHitsInMs.begin(); itHitIn < fvmHitsInMs.end(); ++itHitIn ) + /* + /// Sort the buffers of hits + std::sort( fvmHitsInMs.begin(), fvmHitsInMs.end() ); + + /// Add the hits to the output buffer as Digis + for( auto itHitIn = fvmHitsInMs.begin(); itHitIn < fvmHitsInMs.end(); ++itHitIn ) + { + UInt_t uFebIdx = itHitIn->GetAsic() / fUnpackPar->GetNbAsicsPerFeb() + + ( itHitIn->GetDpb() * fUnpackPar->GetNbCrobsPerDpb() + itHitIn->GetCrob() ) + * fUnpackPar->GetNbFebsPerCrob(); + UInt_t uChanInFeb = itHitIn->GetChan() + + fUnpackPar->GetNbChanPerAsic() * (itHitIn->GetAsic() % fUnpackPar->GetNbAsicsPerFeb()); + + ULong64_t ulTimeInNs = static_cast< ULong64_t >( itHitIn->GetTs() * stsxyter::kdClockCycleNs - fdTimeOffsetNs ); + + fDigiVect.push_back( CbmTofDigi( fviFebAddress[ uFebIdx ], uChanInFeb, ulTimeInNs, itHitIn->GetAdc() ) ); + } // for( auto itHitIn = fvmHitsInMs.begin(); itHitIn < fvmHitsInMs.end(); ++itHitIn ) */ /// Clear the buffer of hits fvmHitsInMs.clear(); @@ -923,18 +923,18 @@ Bool_t CbmMcbm2018MonitorAlgoMuchLite::ProcessTs(const fles::Timeslice& ts) /// Clear buffers to prepare for the next TS fvmHitsInMs.clear(); - /* - for( UInt_t uDpb = 0; uDpb < fuNrOfDpbs; ++uDpb ) - { - fvmHitsInMs[ uDpb ].clear(); - } // for( UInt_t uDpb = 0; uDpb < fuNrOfDpbs; ++uDpb ) + /* + for( UInt_t uDpb = 0; uDpb < fuNrOfDpbs; ++uDpb ) + { + fvmHitsInMs[ uDpb ].clear(); + } // for( UInt_t uDpb = 0; uDpb < fuNrOfDpbs; ++uDpb ) */ /// Fill plots if in monitor mode if (fbMonitorMode) { //if (kFALSE == FillHistograms()) { - /* if (kFALSE == CreateHistograms()) { - LOG(error) << "Failed to fill histos in ts " << fulCurrentTsIdx; - return kFALSE; + /* if (kFALSE == CreateHistograms()) { + LOG(error) << "Failed to fill histos in ts " << fulCurrentTsIdx; + return kFALSE; }*/ // if( kFALSE == FillHistograms() ) //closed by me } // if( fbMonitorMode ) @@ -951,14 +951,14 @@ Bool_t CbmMcbm2018MonitorAlgoMuchLite::ProcessMs(const fles::Timeslice& ts, size if (0 == fvbMaskedComponents.size()) fvbMaskedComponents.resize(ts.num_components(), kFALSE); if (0 == fulCurrentTsIdx && 0 == uMsIdx) { - /* - LOG(info) << "hi hv eqid flag si sv idx/start crc size offset"; - LOG(info) << Form( "%02x %02x %04x %04x %02x %02x %016llx %08x %08x %016llx", - static_cast<unsigned int>(msDescriptor.hdr_id), - static_cast<unsigned int>(msDescriptor.hdr_ver), msDescriptor.eq_id, msDescriptor.flags, - static_cast<unsigned int>(msDescriptor.sys_id), - static_cast<unsigned int>(msDescriptor.sys_ver), msDescriptor.idx, msDescriptor.crc, - msDescriptor.size, msDescriptor.offset ); + /* + LOG(info) << "hi hv eqid flag si sv idx/start crc size offset"; + LOG(info) << Form( "%02x %02x %04x %04x %02x %02x %016llx %08x %08x %016llx", + static_cast<unsigned int>(msDescriptor.hdr_id), + static_cast<unsigned int>(msDescriptor.hdr_ver), msDescriptor.eq_id, msDescriptor.flags, + static_cast<unsigned int>(msDescriptor.sys_id), + static_cast<unsigned int>(msDescriptor.sys_ver), msDescriptor.idx, msDescriptor.crc, + msDescriptor.size, msDescriptor.offset ); */ LOG(info) << FormatMsHeaderPrintout(msDescriptor); } // if( 0 == fulCurrentTsIndex && 0 == uMsIdx ) @@ -1052,13 +1052,13 @@ Bool_t CbmMcbm2018MonitorAlgoMuchLite::ProcessMs(const fles::Timeslice& ts, size fvuInitialHeaderDone[fuCurrDpbIdx] = kTRUE; } // if( kFALSE == fvuInitialHeaderDone[ fuCurrDpbIdx ] ) else if (uTsMsbCycleHeader != fvuCurrentTsMsbCycle[fuCurrDpbIdx] && 4194303 != fvulCurrentTsMsb[fuCurrDpbIdx]) { - /* - LOG(warning) << "TS MSB cycle from MS header does not match current cycle from data " - << "for TS " << std::setw( 12 ) << fulCurrentTsIdx - << " MS " << std::setw( 12 ) << fulCurrentMsIdx - << " MsInTs " << std::setw( 3 ) << uMsIdx - << " ====> " << fvuCurrentTsMsbCycle[ fuCurrDpbIdx ] - << " VS " << uTsMsbCycleHeader; + /* + LOG(warning) << "TS MSB cycle from MS header does not match current cycle from data " + << "for TS " << std::setw( 12 ) << fulCurrentTsIdx + << " MS " << std::setw( 12 ) << fulCurrentMsIdx + << " MsInTs " << std::setw( 3 ) << uMsIdx + << " ====> " << fvuCurrentTsMsbCycle[ fuCurrDpbIdx ] + << " VS " << uTsMsbCycleHeader; */ fvuCurrentTsMsbCycle[fuCurrDpbIdx] = uTsMsbCycleHeader; } @@ -1082,11 +1082,11 @@ Bool_t CbmMcbm2018MonitorAlgoMuchLite::ProcessMs(const fles::Timeslice& ts, size // Print message if requested if (fbPrintMessages) mess.PrintMess(std::cout, fPrintMessCtrl); - /* - if( 1000 == fulCurrentTsIdx ) - { - mess.PrintMess( std::cout, fPrintMessCtrl ); - } // if( 0 == fulCurrentTsIdx ) + /* + if( 1000 == fulCurrentTsIdx ) + { + mess.PrintMess( std::cout, fPrintMessCtrl ); + } // if( 0 == fulCurrentTsIdx ) */ stsxyter::MessType typeMess = mess.GetMessType(); fmMsgCounter[typeMess]++; @@ -1261,25 +1261,25 @@ void CbmMcbm2018MonitorAlgoMuchLite::FillHitInfo(stsxyter::Message mess, const U fvdChanLastHitTime[uAsicIdx][usChan] = fvulChanLastHitTime[uAsicIdx][usChan] * stsxyter::kdClockCycleNs; // For StsXyter2.0 Duplicate Hit Error //Int_t ModuleNr = fUnpackParMuch->GetModule(uAsicIdx); - /* - fhMuchFebDuplicateHitProf[ModuleNr]->Fill(FebId,0); - if( ulOldHitTime == fvulChanLastHitTime[uAsicIdx][usChan] ) - fhMuchFebDuplicateHitProf[ModuleNr]->Fill(FebId,1); + /* + fhMuchFebDuplicateHitProf[ModuleNr]->Fill(FebId,0); + if( ulOldHitTime == fvulChanLastHitTime[uAsicIdx][usChan] ) + fhMuchFebDuplicateHitProf[ModuleNr]->Fill(FebId,1); */ - /* - LOG(info) << " Asic " << std::setw( 2 ) << uAsicIdx - << " Channel " << std::setw( 3 ) << usChan - << " Diff to last hit " << std::setw( 12 ) << ( fvulChanLastHitTime[ uAsicIdx ][ usChan ] - ulOldHitTime) - << " in s " << std::setw( 12 ) << ( fvdChanLastHitTime[ uAsicIdx ][ usChan ] - dOldHitTime) * 1e-9; + /* + LOG(info) << " Asic " << std::setw( 2 ) << uAsicIdx + << " Channel " << std::setw( 3 ) << usChan + << " Diff to last hit " << std::setw( 12 ) << ( fvulChanLastHitTime[ uAsicIdx ][ usChan ] - ulOldHitTime) + << " in s " << std::setw( 12 ) << ( fvdChanLastHitTime[ uAsicIdx ][ usChan ] - dOldHitTime) * 1e-9; */ // Pulser and MS fvuChanNbHitsInMs[uAsicIdx][usChan][uMsIdx]++; fvdChanLastHitTimeInMs[uAsicIdx][usChan][uMsIdx] = dHitTimeNs; fvusChanLastHitAdcInMs[uAsicIdx][usChan][uMsIdx] = usRawAdc; - /* - fvmChanHitsInTs[ uAsicIdx ][ usChan ].insert( stsxyter::FinalHit( fvulChanLastHitTime[ uAsicIdx ][ usChan ], - usRawAdc, uAsicIdx, usChan ) ); + /* + fvmChanHitsInTs[ uAsicIdx ][ usChan ].insert( stsxyter::FinalHit( fvulChanLastHitTime[ uAsicIdx ][ usChan ], + usRawAdc, uAsicIdx, usChan ) ); */ fvmHitsInMs.push_back(stsxyter::FinalHit(fvulChanLastHitTime[uAsicIdx][usChan], usRawAdc, uAsicIdx, usChan)); @@ -1321,14 +1321,14 @@ void CbmMcbm2018MonitorAlgoMuchLite::FillHitInfo(stsxyter::Message mess, const U fhMuchFebChanCntRaw[uFebIdx]->Fill(usChan); fhMuchChannelTime[uFebIdx]->Fill(dTimeSinceStartSec, usChan); - /* - if( mess.IsHitMissedEvts() ) - { - fhMuchFebChanMissEvtEvo[ uFebIdx ]->Fill( dTimeSinceStartSec, uChanInFeb ); - fhMuchFebAsicMissEvtEvo[ uFebIdx ]->Fill( dTimeSinceStartSec, uAsicInFeb ); - fhMuchFebMissEvtEvo[ uFebIdx ]->Fill( dTimeSinceStartSec ); - } // if( mess.IsHitMissedEvts() ) - //if(fvdChanLastHitTime[ uAsicIdx ][ usChan ] == prevTime && uAsicIdx == prevAsic && usChan == prevChan) + /* + if( mess.IsHitMissedEvts() ) + { + fhMuchFebChanMissEvtEvo[ uFebIdx ]->Fill( dTimeSinceStartSec, uChanInFeb ); + fhMuchFebAsicMissEvtEvo[ uFebIdx ]->Fill( dTimeSinceStartSec, uAsicInFeb ); + fhMuchFebMissEvtEvo[ uFebIdx ]->Fill( dTimeSinceStartSec ); + } // if( mess.IsHitMissedEvts() ) + //if(fvdChanLastHitTime[ uAsicIdx ][ usChan ] == prevTime && uAsicIdx == prevAsic && usChan == prevChan) */ if (fvdChanLastHitTime[uAsicIdx][usChan] == prevTime && usChan == prevChan) { //fDupliCount++; @@ -1353,11 +1353,11 @@ void CbmMcbm2018MonitorAlgoMuchLite::FillTsMsbInfo(stsxyter::Message mess, UInt_ fvuCurrentTsMsbCycle[fuCurrDpbIdx]++; } // if( uVal < fvulCurrentTsMsb[fuCurrDpbIdx] ) fvulCurrentTsMsb[fuCurrDpbIdx] = uVal; - /* - ULong64_t ulNewTsMsbTime = static_cast< ULong64_t >( stsxyter::kuHitNbTsBins ) - * static_cast< ULong64_t >( fvulCurrentTsMsb[fuCurrDpbIdx]) - + static_cast< ULong64_t >( stsxyter::kulTsCycleNbBins ) - * static_cast< ULong64_t >( fvuCurrentTsMsbCycle[fuCurrDpbIdx] ); + /* + ULong64_t ulNewTsMsbTime = static_cast< ULong64_t >( stsxyter::kuHitNbTsBins ) + * static_cast< ULong64_t >( fvulCurrentTsMsb[fuCurrDpbIdx]) + + static_cast< ULong64_t >( stsxyter::kulTsCycleNbBins ) + * static_cast< ULong64_t >( fvuCurrentTsMsbCycle[fuCurrDpbIdx] ); */ } @@ -1425,14 +1425,14 @@ void CbmMcbm2018MonitorAlgoMuchLite::SaveAllHistos(TString sFileName) // fhMuchFebHitRateEvo_mskch[ uFebIdx ]->Write(); // fhMuchFebHitRateEvo_mskch_adccut[ uFebIdx ]->Write(); // fhMuchFebHitRateEvo_WithoutDupli[ uFebIdx ]->Write(); - /*fhMuchFebChanHitRateEvoLong[ uFebIdx ]->Write(); - fhMuchFebAsicHitRateEvoLong[ uFebIdx ]->Write(); - fhMuchFebHitRateEvoLong[ uFebIdx ]->Write(); - fhMuchFebChanDistT[ uFebIdx ]->Write(); - for( UInt_t uFebIdxB = uFebIdx; uFebIdxB < fuNbFebs; ++uFebIdxB ) - { - fhMuchFebChanDtCoinc[ uFebIdx ][ uFebIdxB ]->Write(); - fhMuchFebChanCoinc[ uFebIdx ][ uFebIdxB ]->Write(); + /*fhMuchFebChanHitRateEvoLong[ uFebIdx ]->Write(); + fhMuchFebAsicHitRateEvoLong[ uFebIdx ]->Write(); + fhMuchFebHitRateEvoLong[ uFebIdx ]->Write(); + fhMuchFebChanDistT[ uFebIdx ]->Write(); + for( UInt_t uFebIdxB = uFebIdx; uFebIdxB < fuNbFebs; ++uFebIdxB ) + { + fhMuchFebChanDtCoinc[ uFebIdx ][ uFebIdxB ]->Write(); + fhMuchFebChanCoinc[ uFebIdx ][ uFebIdxB ]->Write(); } // for( UInt_t uFebIdxB = uFebIdx; uFebIdxB < fuNbFebs; ++uFebIdxB )*/ } // if( kTRUE == fUnpackParMuch->IsFebActive( uFebIdx ) ) } // for( UInt_t uFebIdx = 0; uFebIdx < fuNbFebs; ++uFebIdx ) @@ -1504,14 +1504,14 @@ void CbmMcbm2018MonitorAlgoMuchLite::ResetAllHistos() // fhMuchFebHitRateEvo_mskch[ uFebIdx ]->Reset(); // fhMuchFebHitRateEvo_mskch_adccut[ uFebIdx ]->Reset(); // fhMuchFebHitRateEvo_WithoutDupli[ uFebIdx ]->Reset(); - /*fhMuchFebChanHitRateEvoLong[ uFebIdx ]->Reset(); - fhMuchFebAsicHitRateEvoLong[ uFebIdx ]->Reset(); - fhMuchFebHitRateEvoLong[ uFebIdx ]->Reset(); - fhMuchFebChanDistT[ uFebIdx ]->Reset(); - for( UInt_t uFebIdxB = uFebIdx; uFebIdxB < fuNbFebs; ++uFebIdxB ) - { - fhMuchFebChanDtCoinc[ uFebIdx ][ uFebIdxB ]->Reset(); - fhMuchFebChanCoinc[ uFebIdx ][ uFebIdxB ]->Reset(); + /*fhMuchFebChanHitRateEvoLong[ uFebIdx ]->Reset(); + fhMuchFebAsicHitRateEvoLong[ uFebIdx ]->Reset(); + fhMuchFebHitRateEvoLong[ uFebIdx ]->Reset(); + fhMuchFebChanDistT[ uFebIdx ]->Reset(); + for( UInt_t uFebIdxB = uFebIdx; uFebIdxB < fuNbFebs; ++uFebIdxB ) + { + fhMuchFebChanDtCoinc[ uFebIdx ][ uFebIdxB ]->Reset(); + fhMuchFebChanCoinc[ uFebIdx ][ uFebIdxB ]->Reset(); } // for( UInt_t uFebIdxB = uFebIdx; uFebIdxB < fuNbFebs; ++uFebIdxB )*/ } // if( kTRUE == fUnpackParMuch->IsFebActive( uFebIdx ) ) } // for( UInt_t uFebIdx = 0; uFebIdx < fuNbFebs; ++uFebIdx )