From f499a27a01dccaf32372fe00c15943be525fe2bc Mon Sep 17 00:00:00 2001
From: Dominik Smith <smith@th.physik.uni-frankfurt.de>
Date: Tue, 20 Jul 2021 13:10:47 +0200
Subject: [PATCH] Removed fhStsAsicTsMsb from CbmStsUnpackMonitor and
CbmStsUnpackAlgo.
---
reco/detectors/sts/unpack/CbmStsUnpackAlgo.cxx | 7 -------
reco/detectors/sts/unpack/CbmStsUnpackMonitor.cxx | 7 -------
reco/detectors/sts/unpack/CbmStsUnpackMonitor.h | 2 --
3 files changed, 16 deletions(-)
diff --git a/reco/detectors/sts/unpack/CbmStsUnpackAlgo.cxx b/reco/detectors/sts/unpack/CbmStsUnpackAlgo.cxx
index 279e6f0dec..5af3f3d1f0 100644
--- a/reco/detectors/sts/unpack/CbmStsUnpackAlgo.cxx
+++ b/reco/detectors/sts/unpack/CbmStsUnpackAlgo.cxx
@@ -457,7 +457,6 @@ void CbmStsUnpackAlgo::processHitInfo(const stsxyter::Message& mess)
// Get the asix index
uint32_t uAsicIdx = getAsicIndex(fuCurrDpbIdx, uCrobIdx, usElinkIdx);
-
const uint16_t usChan = mess.GetHitChannel();
const uint16_t usRawAdc = mess.GetHitAdc();
const uint16_t usRawTs = mess.GetHitTimeBinning();
@@ -510,7 +509,6 @@ void CbmStsUnpackAlgo::processHitInfo(const stsxyter::Message& mess)
fviFebSide[uFebIdx]);
}
-
fOutputVec.emplace_back(CbmStsDigi(fviFebAddress[uFebIdx], uChanInMod, ulTimeInNs, dCalAdc));
// REMARK This seems to be double looping, I do not see any reason here, to first store the stsxyter hits in a vector over which we loop afterwards again. May be I miss something @sts-experts?
// fvmHitsInMs.push_back(stsxyter::FinalHit(ulHitTime, usRawAdc, uAsicIdx, usChan, fuCurrDpbIdx, uCrobIdx));
@@ -617,11 +615,6 @@ void CbmStsUnpackAlgo::processTsMsbInfo(const stsxyter::Message& mess, uint32_t
fMonitor->FillStsDpbRawTsMsb(fuCurrDpbIdx, fvulCurrentTsMsb[fuCurrDpbIdx]);
fMonitor->FillStsDpbRawTsMsbSx(fuCurrDpbIdx, fvulCurrentTsMsb[fuCurrDpbIdx]);
fMonitor->FillStsDpbRawTsMsbDpb(fuCurrDpbIdx, fvulCurrentTsMsb[fuCurrDpbIdx]);
- const uint16_t usElinkIdx = mess.GetStatusLink();
- const uint32_t uCrobIdx = usElinkIdx / fNrElinksPerCrob;
- const uint32_t uAsicIdx = getAsicIndex(fuCurrDpbIdx, uCrobIdx, usElinkIdx);
-
- fMonitor->FillStsAsicTsMsb(fvulCurrentTsMsb[fuCurrDpbIdx], uAsicIdx);
}
}
diff --git a/reco/detectors/sts/unpack/CbmStsUnpackMonitor.cxx b/reco/detectors/sts/unpack/CbmStsUnpackMonitor.cxx
index 07acc65f5a..d2052233a9 100644
--- a/reco/detectors/sts/unpack/CbmStsUnpackMonitor.cxx
+++ b/reco/detectors/sts/unpack/CbmStsUnpackMonitor.cxx
@@ -441,12 +441,6 @@ Bool_t CbmStsUnpackMonitor::CreateDebugHistograms(CbmMcbm2018StsPar* pUnpackPar)
fhStsDpbRawTsMsbDpb->SetCanExtend(TH2::kAllAxes);
AddHistoToVector(fhStsDpbRawTsMsbDpb, "");
- sHistName = "fhStsAsicTsMsb";
- title = "MSB messages for each Asic; TsMsb; Asic; Count []";
- fhStsAsicTsMsb = new TH2I(sHistName, title, 10, 0, 10, uNbAsics, 0, uNbAsics);
- fhStsAsicTsMsb->SetCanExtend(TH2::kAllAxes);
- AddHistoToVector(fhStsAsicTsMsb, "");
-
/// Asic plots
/// All histos per Asic: with channels or ASIC as axis!!
for (UInt_t uAsicIdx = 0; uAsicIdx < uNbAsics; ++uAsicIdx) {
@@ -502,7 +496,6 @@ Bool_t CbmStsUnpackMonitor::ResetDebugHistograms()
fhStsDpbRawTsMsb->Reset();
fhStsDpbRawTsMsbSx->Reset();
fhStsDpbRawTsMsbDpb->Reset();
- fhStsAsicTsMsb->Reset();
for (UInt_t uAsicIdx = 0; uAsicIdx < fvhStsChanCntRaw.size(); ++uAsicIdx) {
fvhStsChanCntRaw[uAsicIdx]->Reset();
diff --git a/reco/detectors/sts/unpack/CbmStsUnpackMonitor.h b/reco/detectors/sts/unpack/CbmStsUnpackMonitor.h
index ab1536a39a..0811c58b81 100644
--- a/reco/detectors/sts/unpack/CbmStsUnpackMonitor.h
+++ b/reco/detectors/sts/unpack/CbmStsUnpackMonitor.h
@@ -164,7 +164,6 @@ public:
{
fhStsDpbRawTsMsbDpb->Fill(uCurrDpbIdx, (ulCurrentTsMsb >> 5));
}
- void FillStsAsicTsMsb(ULong_t ulCurrentTsMsb, UInt_t uAsicIdx) { fhStsAsicTsMsb->Fill(ulCurrentTsMsb, uAsicIdx); }
///Fill debugging "per Asic" histogram vectors
void FillStsChanCntRaw(UInt_t uAsicIdx, UShort_t usChan) { fvhStsChanCntRaw[uAsicIdx]->Fill(usChan); }
@@ -260,7 +259,6 @@ private:
TH2* fhStsDpbRawTsMsb = nullptr;
TH2* fhStsDpbRawTsMsbSx = nullptr;
TH2* fhStsDpbRawTsMsbDpb = nullptr;
- TH2* fhStsAsicTsMsb = nullptr;
static const UInt_t kiMaxNbFlibLinks = 32;
TH1* fvhMsSize[kiMaxNbFlibLinks];
--
GitLab