From 2f1a7c52c5e5f921c9f45ebc3790ce4e2c64cb82 Mon Sep 17 00:00:00 2001 From: matteo Date: Tue, 28 Nov 2023 17:49:39 +0100 Subject: [PATCH] =?UTF-8?q?Added=20Aa=C3=83=C3=B2ll=20sums=20and=20moved?= =?UTF-8?q?=20conversion=20scripts=20to=20L1TScouting?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../L1Scouting/interface/L1ScoutingCalo.h | 244 +++++++++++------- .../L1Scouting/interface/L1ScoutingMuon.h | 50 ++-- .../L1Scouting/interface/OrbitCollection.h | 7 +- EventFilter/L1ScoutingRawToDigi/BuildFile.xml | 1 + .../L1ScoutingRawToDigi/interface/blocks.h | 15 +- .../L1ScoutingRawToDigi/plugins/BuildFile.xml | 21 +- .../plugins/ScCALORawToDigi.cc | 183 ++++++------- .../plugins/ScCALORawToDigi.h | 5 +- .../plugins/ScGMTRawToDigi.cc | 11 +- .../plugins/ScGMTRawToDigi.h | 3 +- .../test/testScoutingRun3_daqsource.py | 128 --------- .../test/testScoutingRun3_unpackers.py | 10 +- .../Utilities}/interface/conversion.h | 10 +- .../Utilities/interface/printScObjects.h | 20 ++ .../Utilities}/interface/scales.h | 8 +- .../Utilities/plugins/BuildFile.xml | 17 +- .../Utilities/plugins/DumpScObjects.cc | 76 +----- .../Utilities/src/printScObjects.cc | 76 ++++++ .../Utilities/test/dumpScObjects.py | 6 +- 19 files changed, 410 insertions(+), 481 deletions(-) delete mode 100644 EventFilter/Utilities/test/testScoutingRun3_daqsource.py rename {EventFilter/L1ScoutingRawToDigi => L1TriggerScouting/Utilities}/interface/conversion.h (79%) create mode 100644 L1TriggerScouting/Utilities/interface/printScObjects.h rename {EventFilter/L1ScoutingRawToDigi => L1TriggerScouting/Utilities}/interface/scales.h (76%) create mode 100644 L1TriggerScouting/Utilities/src/printScObjects.cc diff --git a/DataFormats/L1Scouting/interface/L1ScoutingCalo.h b/DataFormats/L1Scouting/interface/L1ScoutingCalo.h index 61f6f8cc1a2d3..994bfa1fb2246 100644 --- a/DataFormats/L1Scouting/interface/L1ScoutingCalo.h +++ b/DataFormats/L1Scouting/interface/L1ScoutingCalo.h @@ -48,15 +48,15 @@ namespace l1ScoutingRun3 { swap(hwIso_, other.hwIso_); } - inline void setHwEt(int hwEt) { hwEt_= hwEt;} - inline void setHwEta(int hwEta) { hwEta_= hwEta;} - inline void setHwPhi(int hwPhi) { hwPhi_= hwPhi;} - inline void setHwIso(int hwIso) { hwIso_= hwIso;} + void setHwEt(int hwEt) { hwEt_= hwEt;} + void setHwEta(int hwEta) { hwEta_= hwEta;} + void setHwPhi(int hwPhi) { hwPhi_= hwPhi;} + void setHwIso(int hwIso) { hwIso_= hwIso;} - inline int hwEt() const {return hwEt_;} - inline int hwEta() const {return hwEta_;} - inline int hwPhi() const {return hwPhi_;} - inline int hwIso() const {return hwIso_;} + int hwEt() const {return hwEt_;} + int hwEta() const {return hwEta_;} + int hwPhi() const {return hwPhi_;} + int hwIso() const {return hwIso_;} private: int hwEt_; @@ -78,8 +78,8 @@ namespace l1ScoutingRun3 { : ScCaloObject(hwEt, hwEta ,hwPhi , hwQual) {} // store quality instead of iso - inline void setHwQual(int hwQual) { setHwIso(hwQual);} - inline int hwQual() const {return hwIso();} + void setHwQual(int hwQual) { setHwIso(hwQual);} + int hwQual() const {return hwIso();} }; @@ -135,13 +135,13 @@ namespace l1ScoutingRun3 { swap(type_, other.type_); } - inline void setHwEt(int hwEt) { hwEt_= hwEt;} - inline void setHwPhi(int hwPhi) { hwPhi_= hwPhi;} - inline void setType(l1t::EtSum::EtSumType type) { type_= type;} + void setHwEt(int hwEt) { hwEt_= hwEt;} + void setHwPhi(int hwPhi) { hwPhi_= hwPhi;} + void setType(l1t::EtSum::EtSumType type) { type_= type;} - inline int hwEt() const {return hwEt_;} - inline int hwPhi() const {return hwPhi_;} - inline l1t::EtSum::EtSumType type() const {return type_;} + int hwEt() const {return hwEt_;} + int hwPhi() const {return hwPhi_;} + l1t::EtSum::EtSumType type() const {return type_;} private: int hwEt_; @@ -153,29 +153,73 @@ namespace l1ScoutingRun3 { public: ScBxSums() - : hwTotalEt_(0), hwTotalEtEm_(0), minBiasHFP0_(0), - hwTotalHt_(0), towerCount_(0), minBiasHFM0_(0), - hwMissEt_(0), hwMissEtPhi_(0), hwAsymEt_(0), minBiasHFP1_(0), - hwMissHt_(0), hwMissHtPhi_(0), hwAsymHt_(0), minBiasHFM1_(0), - hwMissEtHF_(0), hwMissEtHFPhi_(0), hwAsymEtHF_(0), - hwMissHtHF_(0), hwMissHtHFPhi_(0), hwAsymHtHF_(0), centrality_(0) + : hwTotalEt_(0), + hwTotalEtEm_(0), + hwTotalHt_(0), + hwMissEt_(0), + hwMissEtPhi_(0), + hwMissHt_(0), + hwMissHtPhi_(0), + hwMissEtHF_(0), + hwMissEtHFPhi_(0), + hwMissHtHF_(0), + hwMissHtHFPhi_(0), + hwAsymEt_(0), + hwAsymHt_(0), + hwAsymEtHF_(0), + hwAsymHtHF_(0), + minBiasHFP0_(0), + minBiasHFM0_(0), + minBiasHFP1_(0), + minBiasHFM1_(0), + towerCount_(0), + centrality_(0) {} ScBxSums( - int hwTotalEt, int hwTotalEtEm, int minBiasHFP0, - int hwTotalHt, int towerCount, int minBiasHFM0, - int hwMissEt, int hwMissEtPhi, int hwAsymEt, int minBiasHFP1, - int hwMissHt, int hwMissHtPhi, int hwAsymHt, int minBiasHFM1, - int hwMissEtHF, int hwMissEtHFPhi, int hwAsymEtHF, - int hwMissHtHF, int hwMissHtHFPhi, int hwAsymHtHF, int centrality + int hwTotalEt, + int hwTotalEtEm, + int hwTotalHt, + int hwMissEt, + int hwMissEtPhi, + int hwMissHt, + int hwMissHtPhi, + int hwMissEtHF, + int hwMissEtHFPhi, + int hwMissHtHF, + int hwMissHtHFPhi, + int hwAsymEt, + int hwAsymHt, + int hwAsymEtHF, + int hwAsymHtHF, + int minBiasHFP0, + int minBiasHFM0, + int minBiasHFP1, + int minBiasHFM1, + int towerCount, + int centrality ) - : hwTotalEt_(hwTotalEt), hwTotalEtEm_(hwTotalEtEm), minBiasHFP0_(minBiasHFP0), - hwTotalHt_(hwTotalHt), towerCount_(towerCount), minBiasHFM0_(minBiasHFM0), - hwMissEt_(hwMissEt), hwMissEtPhi_(hwMissEtPhi), hwAsymEt_(hwAsymEt), - minBiasHFP1_(minBiasHFP1), hwMissHt_(hwMissHt), hwMissHtPhi_(hwMissHtPhi), - hwAsymHt_(hwAsymHt), minBiasHFM1_(minBiasHFM1), hwMissEtHF_(hwMissEtHF), - hwMissEtHFPhi_(hwMissEtHFPhi), hwAsymEtHF_(hwAsymEtHF), hwMissHtHF_(hwMissHtHF), - hwMissHtHFPhi_(hwMissHtHFPhi), hwAsymHtHF_(hwAsymHtHF), centrality_(centrality) + : hwTotalEt_(hwTotalEt), + hwTotalEtEm_(hwTotalEtEm), + hwTotalHt_(hwTotalHt), + hwMissEt_(hwMissEt), + hwMissEtPhi_(hwMissEtPhi), + hwMissHt_(hwMissHt), + hwMissHtPhi_(hwMissHtPhi), + hwMissEtHF_(hwMissEtHF), + hwMissEtHFPhi_(hwMissEtHFPhi), + hwMissHtHF_(hwMissHtHF), + hwMissHtHFPhi_(hwMissHtHFPhi), + hwAsymEt_(hwAsymEt), + hwAsymHt_(hwAsymHt), + hwAsymEtHF_(hwAsymEtHF), + hwAsymHtHF_(hwAsymHtHF), + minBiasHFP0_(minBiasHFP0), + minBiasHFM0_(minBiasHFM0), + minBiasHFP1_(minBiasHFP1), + minBiasHFM1_(minBiasHFM1), + towerCount_(towerCount), + centrality_(centrality) {} ScBxSums(const ScBxSums& other) = default; @@ -187,79 +231,93 @@ namespace l1ScoutingRun3 { using std::swap; swap(hwTotalEt_, other.hwTotalEt_); swap(hwTotalEtEm_, other.hwTotalEtEm_); - swap(minBiasHFP0_, other.minBiasHFP0_); swap(hwTotalHt_, other.hwTotalHt_); - swap(towerCount_, other.towerCount_); - swap(minBiasHFM0_, other.minBiasHFM0_); swap(hwMissEt_, other.hwMissEt_); swap(hwMissEtPhi_, other.hwMissEtPhi_); - swap(hwAsymEt_, other.hwAsymEt_); - swap(minBiasHFP1_, other.minBiasHFP1_); swap(hwMissHt_, other.hwMissHt_); swap(hwMissHtPhi_, other.hwMissHtPhi_); - swap(hwAsymHt_, other.hwAsymHt_); - swap(minBiasHFM1_, other.minBiasHFM1_); swap(hwMissEtHF_, other.hwMissEtHF_); swap(hwMissEtHFPhi_, other.hwMissEtHFPhi_); - swap(hwAsymEtHF_, other.hwAsymEtHF_); swap(hwMissHtHF_, other.hwMissHtHF_); swap(hwMissHtHFPhi_, other.hwMissHtHFPhi_); + swap(hwAsymEt_, other.hwAsymEt_); + swap(hwAsymHt_, other.hwAsymHt_); + swap(hwAsymEtHF_, other.hwAsymEtHF_); swap(hwAsymHtHF_, other.hwAsymHtHF_); + swap(minBiasHFP0_, other.minBiasHFP0_); + swap(minBiasHFM0_, other.minBiasHFM0_); + swap(minBiasHFP1_, other.minBiasHFP1_); + swap(minBiasHFM1_, other.minBiasHFM1_); + swap(towerCount_, other.towerCount_); swap(centrality_, other.centrality_); - } - inline void setHwTotalEt(int hwTotalEt) {hwTotalEt_ = hwTotalEt;} - inline void setHwTotalEtEm(int hwTotalEtEm) {hwTotalEtEm_ = hwTotalEtEm;} - inline void setMinBiasHFP0(int minBiasHFP0) {minBiasHFP0_ = minBiasHFP0;} - inline void setHwTotalHt(int hwTotalHt) {hwTotalHt_ = hwTotalHt;} - inline void setTowerCount(int towerCount) {towerCount_ = towerCount;} - inline void setMinBiasHFM0(int minBiasHFM0) {minBiasHFM0_ = minBiasHFM0;} - inline void setHwMissEt(int hwMissEt) {hwMissEt_ = hwMissEt;} - inline void setHwMissEtPhi(int hwMissEtPhi) {hwMissEtPhi_ = hwMissEtPhi;} - inline void setHwAsymEt(int hwAsymEt) {hwAsymEt_ = hwAsymEt;} - inline void setMinBiasHFP1(int minBiasHFP1) {minBiasHFP1_ = minBiasHFP1;} - inline void setHwMissHt(int hwMissHt) {hwMissHt_ = hwMissHt;} - inline void setHwMissHtPhi(int hwMissHtPhi) {hwMissHtPhi_ = hwMissHtPhi;} - inline void setHwAsymHt(int hwAsymHt) {hwAsymHt_ = hwAsymHt;} - inline void setMinBiasHFM1(int minBiasHFM1) {minBiasHFM1_ = minBiasHFM1;} - inline void setHwMissEtHF(int hwMissEtHF) {hwMissEtHF_ = hwMissEtHF;} - inline void setHwMissEtHFPhi(int hwMissEtHFPhi) {hwMissEtHFPhi_ = hwMissEtHFPhi;} - inline void setHwAsymEtHF(int hwAsymEtHF) {hwAsymEtHF_ = hwAsymEtHF;} - inline void setHwMissHtHF(int hwMissHtHF) {hwMissHtHF_ = hwMissHtHF;} - inline void setHwMissHtHFPhi(int hwMissHtHFPhi) {hwMissHtHFPhi_ = hwMissHtHFPhi;} - inline void setHwAsymHtHF(int hwAsymHtHF) {hwAsymHtHF_ = hwAsymHtHF;} - inline void setCentrality(int centrality) {centrality_ = centrality;} - - const int hwTotalEt() { return hwTotalEt_;} - const int hwTotalEtEm() { return hwTotalEtEm_;} - const int minBiasHFP0() { return minBiasHFP0_;} - const int hwTotalHt() { return hwTotalHt_;} - const int towerCount() { return towerCount_;} - const int minBiasHFM0() { return minBiasHFM0_;} - const int hwMissEt() { return hwMissEt_;} - const int hwMissEtPhi() { return hwMissEtPhi_;} - const int hwAsymEt() { return hwAsymEt_;} - const int minBiasHFP1() { return minBiasHFP1_;} - const int hwMissHt() { return hwMissHt_;} - const int hwMissHtPhi() { return hwMissHtPhi_;} - const int hwAsymHt() { return hwAsymHt_;} - const int minBiasHFM1() { return minBiasHFM1_;} - const int hwMissEtHF() { return hwMissEtHF_;} - const int hwMissEtHFPhi() { return hwMissEtHFPhi_;} - const int hwAsymEtHF() { return hwAsymEtHF_;} - const int hwMissHtHF() { return hwMissHtHF_;} - const int hwMissHtHFPhi() { return hwMissHtHFPhi_;} - const int hwAsymHtHF() { return hwAsymHtHF_;} - const int centrality() { return centrality_;} + void setHwTotalEt(int hwTotalEt) {hwTotalEt_ = hwTotalEt;} + void setHwTotalEtEm(int hwTotalEtEm) {hwTotalEtEm_ = hwTotalEtEm;} + void setMinBiasHFP0(int minBiasHFP0) {minBiasHFP0_ = minBiasHFP0;} + void setHwTotalHt(int hwTotalHt) {hwTotalHt_ = hwTotalHt;} + void setTowerCount(int towerCount) {towerCount_ = towerCount;} + void setMinBiasHFM0(int minBiasHFM0) {minBiasHFM0_ = minBiasHFM0;} + void setHwMissEt(int hwMissEt) {hwMissEt_ = hwMissEt;} + void setHwMissEtPhi(int hwMissEtPhi) {hwMissEtPhi_ = hwMissEtPhi;} + void setHwAsymEt(int hwAsymEt) {hwAsymEt_ = hwAsymEt;} + void setMinBiasHFP1(int minBiasHFP1) {minBiasHFP1_ = minBiasHFP1;} + void setHwMissHt(int hwMissHt) {hwMissHt_ = hwMissHt;} + void setHwMissHtPhi(int hwMissHtPhi) {hwMissHtPhi_ = hwMissHtPhi;} + void setHwAsymHt(int hwAsymHt) {hwAsymHt_ = hwAsymHt;} + void setMinBiasHFM1(int minBiasHFM1) {minBiasHFM1_ = minBiasHFM1;} + void setHwMissEtHF(int hwMissEtHF) {hwMissEtHF_ = hwMissEtHF;} + void setHwMissEtHFPhi(int hwMissEtHFPhi) {hwMissEtHFPhi_ = hwMissEtHFPhi;} + void setHwAsymEtHF(int hwAsymEtHF) {hwAsymEtHF_ = hwAsymEtHF;} + void setHwMissHtHF(int hwMissHtHF) {hwMissHtHF_ = hwMissHtHF;} + void setHwMissHtHFPhi(int hwMissHtHFPhi) {hwMissHtHFPhi_ = hwMissHtHFPhi;} + void setHwAsymHtHF(int hwAsymHtHF) {hwAsymHtHF_ = hwAsymHtHF;} + void setCentrality(int centrality) {centrality_ = centrality;} + + const int hwTotalEt() const { return hwTotalEt_;} + const int hwTotalEtEm() const { return hwTotalEtEm_;} + const int minBiasHFP0() const { return minBiasHFP0_;} + const int hwTotalHt() const { return hwTotalHt_;} + const int towerCount() const { return towerCount_;} + const int minBiasHFM0() const { return minBiasHFM0_;} + const int hwMissEt() const { return hwMissEt_;} + const int hwMissEtPhi() const { return hwMissEtPhi_;} + const int hwAsymEt() const { return hwAsymEt_;} + const int minBiasHFP1() const { return minBiasHFP1_;} + const int hwMissHt() const { return hwMissHt_;} + const int hwMissHtPhi() const { return hwMissHtPhi_;} + const int hwAsymHt() const { return hwAsymHt_;} + const int minBiasHFM1() const { return minBiasHFM1_;} + const int hwMissEtHF() const { return hwMissEtHF_;} + const int hwMissEtHFPhi() const { return hwMissEtHFPhi_;} + const int hwAsymEtHF() const { return hwAsymEtHF_;} + const int hwMissHtHF() const { return hwMissHtHF_;} + const int hwMissHtHFPhi() const { return hwMissHtHFPhi_;} + const int hwAsymHtHF() const { return hwAsymHtHF_;} + const int centrality() const { return centrality_;} private: - int hwTotalEt_, hwTotalEtEm_, minBiasHFP0_; // sums from ET block - int hwTotalHt_, towerCount_, minBiasHFM0_; // sums from HT block - int hwMissEt_, hwMissEtPhi_, hwAsymEt_, minBiasHFP1_; // sums from EtMiss block - int hwMissHt_, hwMissHtPhi_, hwAsymHt_, minBiasHFM1_; // sums from HTMiss block - int hwMissEtHF_, hwMissEtHFPhi_, hwAsymEtHF_; // sums from ETHFMiss block - int hwMissHtHF_, hwMissHtHFPhi_, hwAsymHtHF_, centrality_; // sums from HTHFMiss block + int hwTotalEt_; + int hwTotalEtEm_; + int hwTotalHt_; + int hwMissEt_; + int hwMissEtPhi_; + int hwMissHt_; + int hwMissHtPhi_; + int hwMissEtHF_; + int hwMissEtHFPhi_; + int hwMissHtHF_; + int hwMissHtHFPhi_; + int hwAsymEt_; + int hwAsymHt_; + int hwAsymEtHF_; + int hwAsymHtHF_; + int minBiasHFP0_; + int minBiasHFM0_; + int minBiasHFP1_; + int minBiasHFM1_; + int towerCount_; + int centrality_; }; } // namespace l1ScoutingRun3 diff --git a/DataFormats/L1Scouting/interface/L1ScoutingMuon.h b/DataFormats/L1Scouting/interface/L1ScoutingMuon.h index b679b0d6edc03..61bb5a1916cec 100644 --- a/DataFormats/L1Scouting/interface/L1ScoutingMuon.h +++ b/DataFormats/L1Scouting/interface/L1ScoutingMuon.h @@ -71,32 +71,32 @@ namespace l1ScoutingRun3 { swap(hwDXY_, other.hwDXY_); } - inline void setHwPt(int hwPt) { hwPt_= hwPt;} - inline void setHwEta(int hwEta) { hwEta_= hwEta;} - inline void setHwPhi(int hwPhi) { hwPhi_= hwPhi;} - inline void setHwQual(int hwQual) { hwQual_= hwQual;} - inline void setHwChrg(int hwChrg) { hwChrg_= hwChrg;} - inline void setHwChrgv(int hwChrgv) { hwChrgv_= hwChrgv;} - inline void setHwIso(int hwIso) { hwIso_= hwIso;} - inline void setTfIndex(int tfIndex) { tfIndex_= tfIndex;} - inline void setHwEtaAtVtx(int hwEtaAtVtx) { hwEtaAtVtx_= hwEtaAtVtx;} - inline void setHwPhiAtVtx(int hwPhiAtVtx) { hwPhiAtVtx_= hwPhiAtVtx;} - inline void setHwPtUnconstrained(int hwPtUnconstrained) { hwPtUnconstrained_= hwPtUnconstrained;} - inline void setHwDXY(int hwDXY) { hwDXY_= hwDXY;} + void setHwPt(int hwPt) { hwPt_= hwPt;} + void setHwEta(int hwEta) { hwEta_= hwEta;} + void setHwPhi(int hwPhi) { hwPhi_= hwPhi;} + void setHwQual(int hwQual) { hwQual_= hwQual;} + void setHwChrg(int hwChrg) { hwChrg_= hwChrg;} + void setHwChrgv(int hwChrgv) { hwChrgv_= hwChrgv;} + void setHwIso(int hwIso) { hwIso_= hwIso;} + void setTfIndex(int tfIndex) { tfIndex_= tfIndex;} + void setHwEtaAtVtx(int hwEtaAtVtx) { hwEtaAtVtx_= hwEtaAtVtx;} + void setHwPhiAtVtx(int hwPhiAtVtx) { hwPhiAtVtx_= hwPhiAtVtx;} + void setHwPtUnconstrained(int hwPtUnconstrained) { hwPtUnconstrained_= hwPtUnconstrained;} + void setHwDXY(int hwDXY) { hwDXY_= hwDXY;} - inline int hwPt() const {return hwPt_;} - inline int hwEta() const {return hwEta_;} - inline int hwPhi() const {return hwPhi_;} - inline int hwQual() const {return hwQual_;} - inline int hwCharge() const {return hwChrg_;} - inline int hwChargeValid() const {return hwChrgv_;} - inline int hwIso() const {return hwIso_;} - inline int hwIndex() const {return tfIndex_;} - inline int hwEtaAtVtx() const {return hwEtaAtVtx_;} - inline int hwPhiAtVtx() const {return hwPhiAtVtx_;} - inline int hwPtUnconstrained() const {return hwPtUnconstrained_;} - inline int hwDXY() const {return hwDXY_;} - inline int tfMuonIndex() const {return tfIndex_;} + int hwPt() const {return hwPt_;} + int hwEta() const {return hwEta_;} + int hwPhi() const {return hwPhi_;} + int hwQual() const {return hwQual_;} + int hwCharge() const {return hwChrg_;} + int hwChargeValid() const {return hwChrgv_;} + int hwIso() const {return hwIso_;} + int hwIndex() const {return tfIndex_;} + int hwEtaAtVtx() const {return hwEtaAtVtx_;} + int hwPhiAtVtx() const {return hwPhiAtVtx_;} + int hwPtUnconstrained() const {return hwPtUnconstrained_;} + int hwDXY() const {return hwDXY_;} + int tfMuonIndex() const {return tfIndex_;} private: int hwPt_; diff --git a/DataFormats/L1Scouting/interface/OrbitCollection.h b/DataFormats/L1Scouting/interface/OrbitCollection.h index 8cd0556165fbf..adbf5f8f24515 100644 --- a/DataFormats/L1Scouting/interface/OrbitCollection.h +++ b/DataFormats/L1Scouting/interface/OrbitCollection.h @@ -136,13 +136,12 @@ class OrbitCollection { T& operator[](std::size_t i) { return data_[i]; } const T& operator[](std::size_t i) const { return data_[i]; } - // edm::View support void fillView(edm::ProductID const& id, std::vector& pointers, edm::FillViewHelperVector& helpers) const { edm::detail::reallyFillView(*this, id, pointers, helpers); } - // edm::Ptr support + void setPtr(std::type_info const& toType, unsigned long index, void const*& ptr) const { edm::detail::reallySetPtr >(*this, toType, index, ptr); } @@ -160,7 +159,6 @@ class OrbitCollection { std::vector data_; }; -// edm::View support namespace edm { template inline void fillView(OrbitCollection const& obj, @@ -174,7 +172,6 @@ namespace edm { static bool const value = true; }; } // namespace edm -// edm::Ptr support template inline void setPtr(OrbitCollection const& obj, std::type_info const& toType, unsigned long index, void const*& ptr) { obj.setPtr(toType, index, ptr); @@ -191,6 +188,6 @@ namespace edm { struct has_setPtr > { static bool const value = true; }; -} +} // namespace edm #endif // DataFormats_L1Scouting_OrbitCollection_h \ No newline at end of file diff --git a/EventFilter/L1ScoutingRawToDigi/BuildFile.xml b/EventFilter/L1ScoutingRawToDigi/BuildFile.xml index 920689c518329..04bc54b4991df 100644 --- a/EventFilter/L1ScoutingRawToDigi/BuildFile.xml +++ b/EventFilter/L1ScoutingRawToDigi/BuildFile.xml @@ -5,6 +5,7 @@ + \ No newline at end of file diff --git a/EventFilter/L1ScoutingRawToDigi/interface/blocks.h b/EventFilter/L1ScoutingRawToDigi/interface/blocks.h index 79bacd540f71c..9df5b230b4b10 100644 --- a/EventFilter/L1ScoutingRawToDigi/interface/blocks.h +++ b/EventFilter/L1ScoutingRawToDigi/interface/blocks.h @@ -2,9 +2,6 @@ #define L1ScoutingRawToDigi_blocks_h #include -#include -#include -#include "scales.h" namespace l1ScoutingRun3 { @@ -31,21 +28,21 @@ namespace demux { uint32_t bx; uint32_t orbit; uint32_t link0; - uint32_t jet1[6]; - uint32_t link1; uint32_t jet2[6]; + uint32_t link1; + uint32_t jet1[6]; uint32_t link2; - uint32_t egamma1[6]; - uint32_t link3; uint32_t egamma2[6]; + uint32_t link3; + uint32_t egamma1[6]; uint32_t link4; uint32_t empty[6]; uint32_t link5; uint32_t sum[6]; uint32_t link6; - uint32_t tau1[6]; - uint32_t link7; uint32_t tau2[6]; + uint32_t link7; + uint32_t tau1[6]; }; } diff --git a/EventFilter/L1ScoutingRawToDigi/plugins/BuildFile.xml b/EventFilter/L1ScoutingRawToDigi/plugins/BuildFile.xml index 32f0b6b906b36..dbb651083a6fb 100644 --- a/EventFilter/L1ScoutingRawToDigi/plugins/BuildFile.xml +++ b/EventFilter/L1ScoutingRawToDigi/plugins/BuildFile.xml @@ -1,11 +1,10 @@ - - - - - - - - - - - \ No newline at end of file + + + + + + + + + + \ No newline at end of file diff --git a/EventFilter/L1ScoutingRawToDigi/plugins/ScCALORawToDigi.cc b/EventFilter/L1ScoutingRawToDigi/plugins/ScCALORawToDigi.cc index 134292e68137d..7cc3df1ef42a0 100644 --- a/EventFilter/L1ScoutingRawToDigi/plugins/ScCALORawToDigi.cc +++ b/EventFilter/L1ScoutingRawToDigi/plugins/ScCALORawToDigi.cc @@ -4,12 +4,12 @@ ScCaloRawToDigi::ScCaloRawToDigi(const edm::ParameterSet& iConfig) { using namespace edm; using namespace l1ScoutingRun3; srcInputTag = iConfig.getParameter("srcInputTag"); + enableAllSums_ = iConfig.getUntrackedParameter("enableAllSums", false); debug_ = iConfig.getUntrackedParameter("debug", false); orbitBufferJets_ = std::vector>(3565); orbitBufferEGammas_ = std::vector>(3565); orbitBufferTaus_ = std::vector>(3565); - // orbitBufferEtSums_ = std::vector>(3565); orbitBufferEtSums_ = std::vector>(3565); nJetsOrbit_=0; nEGammasOrbit_=0; nTausOrbit_=0; nEtSumsOrbit_=0; @@ -17,7 +17,6 @@ ScCaloRawToDigi::ScCaloRawToDigi(const edm::ParameterSet& iConfig) { produces().setBranchAlias( "ScJetOrbitCollection" ); produces().setBranchAlias( "ScTauOrbitCollection" ); produces().setBranchAlias( "ScEGammaOrbitCollection" ); - // produces().setBranchAlias( "ScEtSumOrbitCollection" ); produces().setBranchAlias( "ScBxSumsOrbitCollection" ); rawToken = consumes(srcInputTag); @@ -38,7 +37,6 @@ void ScCaloRawToDigi::produce(edm::Event& iEvent, const edm::EventSetup& iSetup) std::unique_ptr unpackedJets(new ScJetOrbitCollection); std::unique_ptr unpackedTaus(new ScTauOrbitCollection); std::unique_ptr unpackedEGammas(new ScEGammaOrbitCollection); - // std::unique_ptr unpackedEtSums(new ScEtSumOrbitCollection); std::unique_ptr unpackedEtSums(new ScBxSumsOrbitCollection); if((sourceRawData.size()==0) && debug_ ){ @@ -89,7 +87,7 @@ void ScCaloRawToDigi::unpackOrbit( // unpack jets from first link if (debug_) std::cout << "--- Jets link 1 ---\n"; unpackLinkJets(bl->jet1, bx); - + // unpack jets from second link if (debug_) std::cout << "--- Jets link 2 ---\n"; unpackLinkJets(bl->jet2, bx); @@ -97,7 +95,7 @@ void ScCaloRawToDigi::unpackOrbit( // unpack eg from first link if (debug_) std::cout << "--- E/g link 1 ---\n"; unpackLinkEGammas(bl->egamma1, bx); - + // unpack eg from second link link if (debug_) std::cout << "--- E/g link 2 ---\n"; unpackLinkEGammas(bl->egamma2, bx); @@ -105,7 +103,7 @@ void ScCaloRawToDigi::unpackOrbit( // unpack taus from first link if (debug_) std::cout << "--- Taus link 1 ---\n"; unpackLinkTaus(bl->tau1, bx); - + // unpack taus from second link if (debug_) std::cout << "--- Taus link 2 ---\n"; unpackLinkTaus(bl->tau2, bx); @@ -114,7 +112,7 @@ void ScCaloRawToDigi::unpackOrbit( if (debug_) std::cout << "--- Sums ---\n"; unpackEtSums(bl->sum, bx); - } // end of orbit loop + } // end of bx objects } @@ -139,9 +137,7 @@ void ScCaloRawToDigi::unpackLinkJets(uint32_t* dataBlock, int bx){ if (debug_){ std::cout << "Jet " << i << std::endl; std::cout << " Raw: 0x" << std::hex << dataBlock[i] << std::dec << std::endl; - std::cout << " Et [GeV/Hw]: " << demux::fEt(jet.hwEt()) << "/" << jet.hwEt() << "\n"; - std::cout << " Eta [rad/Hw]: " << demux::fEta(jet.hwEta()) << "/" << jet.hwEta() << "\n"; - std::cout << " Phi [rad/Hw]: " << demux::fPhi(jet.hwPhi()) << "/" << jet.hwPhi() << "\n"; + printScJet(jet); } } } // end link jets unpacking loop @@ -167,10 +163,7 @@ void ScCaloRawToDigi::unpackLinkEGammas(uint32_t* dataBlock, int bx){ if (debug_){ std::cout << "E/g " << i << std::endl; std::cout << " Raw: 0x" << std::hex << dataBlock[i] << std::dec << std::endl; - std::cout << " Et [GeV/Hw]: " << demux::fEt(eGamma.hwEt()) << "/" << eGamma.hwEt() << "\n"; - std::cout << " Eta [rad/Hw]: " << demux::fEta(eGamma.hwEta()) << "/" << eGamma.hwEta() << "\n"; - std::cout << " Phi [rad/Hw]: " << demux::fPhi(eGamma.hwPhi()) << "/" << eGamma.hwPhi() << "\n"; - std::cout << " Iso [Hw]: " << eGamma.hwIso() << "\n"; + printScEGamma(eGamma); } } } // end link e/gammas unpacking loop @@ -196,10 +189,7 @@ void ScCaloRawToDigi::unpackLinkTaus(uint32_t* dataBlock, int bx){ if (debug_){ std::cout << "Tau " << i << std::endl; std::cout << " Raw: 0x" << std::hex << dataBlock[i] << std::dec << std::endl; - std::cout << " Et [GeV/Hw]: " << demux::fEt(tau.hwEt()) << "/" << tau.hwEt() << "\n"; - std::cout << " Eta [rad/Hw]: " << demux::fEta(tau.hwEta()) << "/" << tau.hwEta() << "\n"; - std::cout << " Phi [rad/Hw]: " << demux::fPhi(tau.hwPhi()) << "/" << tau.hwPhi() << "\n"; - std::cout << " Iso [Hw]: " << tau.hwIso() << "\n"; + printScTau(tau); } } } // end link taus unpacking loop @@ -217,120 +207,105 @@ void ScCaloRawToDigi::unpackEtSums(uint32_t* dataBlock, int bx){ int32_t ETHFmissEt(0), ETHFmissPhi(0), ETHFmissASYMETHF(0), ETHFmissCENT(0); // ETHFMiss int32_t HTHFmissEt(0), HTHFmissPhi(0), HTHFmissASYMHTHF(0), HTHFmissCENT(0); // HTHFMiss - // ET + // ET block ETEt = ((dataBlock[0] >> demux::shiftsESums::ETEt) & demux::masksESums::ETEt); ETEttem = ((dataBlock[0] >> demux::shiftsESums::ETEttem) & demux::masksESums::ETEttem); - ETMinBiasHFP0 = ((dataBlock[0] >> demux::shiftsESums::ETMinBiasHF) & demux::masksESums::ETMinBiasHF); - // orbitBufferEtSums_[bx].emplace_back(ScEtSum(ETEt, 0, l1t::EtSum::EtSumType::kTotalEt)); - // orbitBufferEtSums_[bx].emplace_back(ScEtSum(ETEttem, 0, l1t::EtSum::EtSumType::kTotalEtEm)); - // orbitBufferEtSums_[bx].emplace_back(ScEtSum(ETMinBiasHFP0, 0, l1t::EtSum::EtSumType::kMinBiasHFP0)); bxSums.setHwTotalEt(ETEt); bxSums.setHwTotalEtEm(ETEttem); - bxSums.setMinBiasHFP0(ETMinBiasHFP0); - // HT + // HT block HTEt = ((dataBlock[1] >> demux::shiftsESums::HTEt) & demux::masksESums::HTEt); - HTtowerCount = ((dataBlock[1] >> demux::shiftsESums::HTtowerCount) & demux::masksESums::HTtowerCount); - HTMinBiasHFM0 = ((dataBlock[1] >> demux::shiftsESums::HTMinBiasHF) & demux::masksESums::HTMinBiasHF); - - // orbitBufferEtSums_[bx].emplace_back(ScEtSum(HTEt, 0, l1t::EtSum::EtSumType::kTotalHt)); - // orbitBufferEtSums_[bx].emplace_back(ScEtSum(HTtowerCount, 0, l1t::EtSum::EtSumType::kTowerCount)); - // orbitBufferEtSums_[bx].emplace_back(ScEtSum(HTMinBiasHFM0, 0, l1t::EtSum::EtSumType::kMinBiasHFM0)); - + bxSums.setHwTotalHt(HTEt); - bxSums.setTowerCount(HTtowerCount); - bxSums.setMinBiasHFM0(HTMinBiasHFM0); - // ETMiss + // ETMiss block ETmissEt = ((dataBlock[2] >> demux::shiftsESums::ETmissEt) & demux::masksESums::ETmissEt); ETmissPhi = ((dataBlock[2] >> demux::shiftsESums::ETmissPhi) & demux::masksESums::ETmissPhi); - ETmissASYMET = ((dataBlock[2] >> demux::shiftsESums::ETmissASYMET) & demux::masksESums::ETmissASYMET); - ETmissMinBiasHFP1 = ((dataBlock[2] >> demux::shiftsESums::ETmissMinBiasHF) & demux::masksESums::ETmissMinBiasHF); - - // orbitBufferEtSums_[bx].emplace_back(ScEtSum(ETmissEt, ETmissPhi, l1t::EtSum::EtSumType::kMissingEt)); - // orbitBufferEtSums_[bx].emplace_back(ScEtSum(ETmissASYMET, 0, l1t::EtSum::EtSumType::kAsymEt)); - // orbitBufferEtSums_[bx].emplace_back(ScEtSum(ETmissMinBiasHFP1, 0, l1t::EtSum::EtSumType::kMinBiasHFP1)); - - bxSums.setHwMissEt(ETmissEt); - bxSums.setHwMissEtPhi(ETmissPhi); - bxSums.setHwAsymEt(ETmissASYMET); - bxSums.setMinBiasHFP1(ETmissMinBiasHFP1); - // HTMiss + if (ETmissEt>0){ + bxSums.setHwMissEt(ETmissEt); + bxSums.setHwMissEtPhi(ETmissPhi); + } + + // HTMiss block HTmissEt = ((dataBlock[3] >> demux::shiftsESums::HTmissEt) & demux::masksESums::HTmissEt); HTmissPhi = ((dataBlock[3] >> demux::shiftsESums::HTmissPhi) & demux::masksESums::HTmissPhi); - HTmissASYMHT = ((dataBlock[3] >> demux::shiftsESums::HTmissASYMHT) & demux::masksESums::HTmissASYMHT); - HTmissMinBiasHFM1 = ((dataBlock[3] >> demux::shiftsESums::HTmissMinBiasHF) & demux::masksESums::HTmissMinBiasHF); + + if (HTmissEt>0){ + bxSums.setHwMissHt(HTmissEt); + bxSums.setHwMissHtPhi(HTmissPhi); + } + + // ETHFMiss block + ETHFmissEt = ((dataBlock[4] >> demux::shiftsESums::ETHFmissEt) & demux::masksESums::ETHFmissEt); + ETHFmissPhi = ((dataBlock[4] >> demux::shiftsESums::ETHFmissPhi) & demux::masksESums::ETHFmissPhi); + + if (ETHFmissEt>0){ + bxSums.setHwMissEtHF(ETHFmissEt); + bxSums.setHwMissEtHFPhi(ETHFmissPhi); + } - // orbitBufferEtSums_[bx].emplace_back(ScEtSum(HTmissEt, HTmissPhi, l1t::EtSum::EtSumType::kMissingHt)); - // orbitBufferEtSums_[bx].emplace_back(ScEtSum(HTmissASYMHT, 0, l1t::EtSum::EtSumType::kAsymHt)); - // orbitBufferEtSums_[bx].emplace_back(ScEtSum(HTmissMinBiasHFM1, 0, l1t::EtSum::EtSumType::kMinBiasHFM1)); + // HTHFMiss block + HTHFmissEt = ((dataBlock[5] >> demux::shiftsESums::ETHFmissEt) & demux::masksESums::ETHFmissEt); + HTHFmissPhi = ((dataBlock[5] >> demux::shiftsESums::ETHFmissPhi) & demux::masksESums::ETHFmissPhi); - std::cout << "BX " << bx << ", Frame 3: " << std::endl; - std::cout << " Raw: 0x" << std::hex << dataBlock[3] << std::dec << "\n" - << " MHTEt: " << HTmissEt << ", MHTEt PHI: " << HTmissPhi << std::endl; + if (HTHFmissEt>0) { + bxSums.setHwMissHtHF(HTHFmissEt); + bxSums.setHwMissHtHFPhi(HTHFmissPhi); + } - bxSums.setHwMissHt(HTmissEt); - bxSums.setHwMissHtPhi(HTmissPhi); - bxSums.setHwAsymHt(HTmissASYMHT); - bxSums.setMinBiasHFM1(HTmissMinBiasHFM1); + // Insert additional sums + if (enableAllSums_) { - // ETHFMiss - ETHFmissEt = ((dataBlock[4] >> demux::shiftsESums::ETHFmissEt) & demux::masksESums::ETHFmissEt); - ETHFmissPhi = ((dataBlock[4] >> demux::shiftsESums::ETHFmissPhi) & demux::masksESums::ETHFmissPhi); - ETHFmissASYMETHF = ((dataBlock[4] >> demux::shiftsESums::ETHFmissASYMETHF) & demux::masksESums::ETHFmissASYMETHF); - ETHFmissCENT = ((dataBlock[4] >> demux::shiftsESums::ETHFmissCENT) & demux::masksESums::ETHFmissCENT); + // ET block + ETMinBiasHFP0 = ((dataBlock[0] >> demux::shiftsESums::ETMinBiasHF) & demux::masksESums::ETMinBiasHF); + bxSums.setMinBiasHFP0(ETMinBiasHFP0); - // orbitBufferEtSums_[bx].emplace_back(ScEtSum(ETHFmissEt, ETHFmissPhi, l1t::EtSum::EtSumType::kMissingEtHF)); - // orbitBufferEtSums_[bx].emplace_back(ScEtSum(ETHFmissASYMETHF, 0, l1t::EtSum::EtSumType::kAsymEtHF)); + // HT block + HTtowerCount = ((dataBlock[1] >> demux::shiftsESums::HTtowerCount) & demux::masksESums::HTtowerCount); + HTMinBiasHFM0 = ((dataBlock[1] >> demux::shiftsESums::HTMinBiasHF) & demux::masksESums::HTMinBiasHF); - bxSums.setHwMissEtHF(ETHFmissEt); - bxSums.setHwMissEtHFPhi(ETHFmissPhi); - bxSums.setHwAsymEtHF(ETHFmissASYMETHF); + bxSums.setTowerCount(HTtowerCount); + bxSums.setMinBiasHFM0(HTMinBiasHFM0); - // HTHFMiss - HTHFmissEt = ((dataBlock[5] >> demux::shiftsESums::ETHFmissEt) & demux::masksESums::ETHFmissEt); - HTHFmissPhi = ((dataBlock[5] >> demux::shiftsESums::ETHFmissPhi) & demux::masksESums::ETHFmissPhi); - HTHFmissASYMHTHF = ((dataBlock[5] >> demux::shiftsESums::ETHFmissASYMETHF) & demux::masksESums::ETHFmissASYMETHF); - HTHFmissCENT = ((dataBlock[5] >> demux::shiftsESums::ETHFmissCENT) & demux::masksESums::ETHFmissCENT); + // ET Miss block + ETmissASYMET = ((dataBlock[2] >> demux::shiftsESums::ETmissASYMET) & demux::masksESums::ETmissASYMET); + ETmissMinBiasHFP1 = ((dataBlock[2] >> demux::shiftsESums::ETmissMinBiasHF) & demux::masksESums::ETmissMinBiasHF); + bxSums.setHwAsymEt(ETmissASYMET); + bxSums.setMinBiasHFP1(ETmissMinBiasHFP1); - // orbitBufferEtSums_[bx].emplace_back(ScEtSum(HTHFmissEt, HTHFmissPhi, l1t::EtSum::EtSumType::kMissingHtHF)); - // orbitBufferEtSums_[bx].emplace_back(ScEtSum(HTHFmissASYMHTHF, 0, l1t::EtSum::EtSumType::kAsymHtHF)); - // orbitBufferEtSums_[bx].emplace_back(ScEtSum((HTHFmissCENT<<4) + ETHFmissCENT, 0, l1t::EtSum::EtSumType::kCentrality)); + // HT Miss block + HTmissASYMHT = ((dataBlock[3] >> demux::shiftsESums::HTmissASYMHT) & demux::masksESums::HTmissASYMHT); + HTmissMinBiasHFM1 = ((dataBlock[3] >> demux::shiftsESums::HTmissMinBiasHF) & demux::masksESums::HTmissMinBiasHF); - bxSums.setHwMissHtHF(HTHFmissEt); - bxSums.setHwMissHtHFPhi(HTHFmissPhi); - bxSums.setHwAsymHtHF(HTHFmissASYMHTHF); - bxSums.setCentrality((HTHFmissCENT<<4) + ETHFmissCENT); + bxSums.setHwAsymHt(HTmissASYMHT); + bxSums.setMinBiasHFM1(HTmissMinBiasHFM1); - // nEtSumsOrbit_ += 17; - nEtSumsOrbit_ += 1; + // ETHFMiss + ETHFmissASYMETHF = ((dataBlock[4] >> demux::shiftsESums::ETHFmissASYMETHF) & demux::masksESums::ETHFmissASYMETHF); + ETHFmissCENT = ((dataBlock[4] >> demux::shiftsESums::ETHFmissCENT) & demux::masksESums::ETHFmissCENT); + + bxSums.setHwAsymEtHF(ETHFmissASYMETHF); + + // HTHFMiss + HTHFmissASYMHTHF = ((dataBlock[5] >> demux::shiftsESums::ETHFmissASYMETHF) & demux::masksESums::ETHFmissASYMETHF); + HTHFmissCENT = ((dataBlock[5] >> demux::shiftsESums::ETHFmissCENT) & demux::masksESums::ETHFmissCENT); + + bxSums.setHwAsymHtHF(HTHFmissASYMHTHF); + bxSums.setCentrality((HTHFmissCENT<<4) + ETHFmissCENT); + } orbitBufferEtSums_[bx].push_back(bxSums); + nEtSumsOrbit_ += 1; if (debug_){ - // std::cout << "Type: TotalET\n" - // << " Raw: 0x" << std::hex << dataBlock[0] << std::dec << "\n" - // << " Et [GeV/Hw]: " << demux::fEt(sumTotEt.hwEt()) << "/" << sumTotEt.hwEt() - // << std::endl; - - // std::cout << "Type: TotalHT\n" - // << " Raw: 0x" << std::hex << dataBlock[1] << std::dec << "\n" - // << " Et [GeV/Hw]: " << demux::fEt(sumTotHt.hwEt()) << "/" << sumTotHt.hwEt() - // << std::endl; - - // std::cout << "Type: ETMiss\n" - // << " Raw: 0x" << std::hex << dataBlock[2] << std::dec << "\n" - // << " Et [GeV/Hw]: " << demux::fEt(sumMissEt.hwEt()) << "/" << sumMissEt.hwEt() << "\n" - // << " Phi [Rad/Hw]: " << demux::fPhi(sumMissEt.hwPhi()) << "/" << sumMissEt.hwPhi() - // << std::endl; - - // std::cout << "Type: HTMiss\n" - // << " Raw: 0x" << std::hex << dataBlock[3] << std::dec << "\n" - // << " Et [GeV/Hw]: " << demux::fEt(sumMissHt.hwEt()) << "/" << sumMissHt.hwEt() << "\n" - // << " Phi [Rad/Hw]: " << demux::fPhi(sumMissHt.hwPhi()) << "/" << sumMissHt.hwPhi() - // << std::endl; + std::cout << "Raw frames:\n"; + for(int frame=0; frame<6; frame++){ + std::cout << " frame " << frame << ": 0x" + << std::hex << dataBlock[frame] << std::dec << std::endl; + } + printScBxSums(bxSums); } } diff --git a/EventFilter/L1ScoutingRawToDigi/plugins/ScCALORawToDigi.h b/EventFilter/L1ScoutingRawToDigi/plugins/ScCALORawToDigi.h index 49bc27351ceb6..c8665cefd9918 100644 --- a/EventFilter/L1ScoutingRawToDigi/plugins/ScCALORawToDigi.h +++ b/EventFilter/L1ScoutingRawToDigi/plugins/ScCALORawToDigi.h @@ -14,10 +14,9 @@ #include "DataFormats/L1Scouting/interface/L1ScoutingCalo.h" #include "EventFilter/L1ScoutingRawToDigi/interface/shifts.h" -#include "EventFilter/L1ScoutingRawToDigi/interface/scales.h" #include "EventFilter/L1ScoutingRawToDigi/interface/masks.h" #include "EventFilter/L1ScoutingRawToDigi/interface/blocks.h" -#include "EventFilter/L1ScoutingRawToDigi/interface/conversion.h" +#include "L1TriggerScouting/Utilities/interface/printScObjects.h" #include #include @@ -47,10 +46,10 @@ class ScCaloRawToDigi : public edm::stream::EDProducer<> { std::vector> orbitBufferJets_; std::vector> orbitBufferEGammas_; std::vector> orbitBufferTaus_; - //std::vector> orbitBufferEtSums_; std::vector> orbitBufferEtSums_; bool debug_ = false; + bool enableAllSums_ = false; edm::InputTag srcInputTag; edm::EDGetToken rawToken; }; diff --git a/EventFilter/L1ScoutingRawToDigi/plugins/ScGMTRawToDigi.cc b/EventFilter/L1ScoutingRawToDigi/plugins/ScGMTRawToDigi.cc index d3f2995cbe9ec..dc5f6c46b6700 100644 --- a/EventFilter/L1ScoutingRawToDigi/plugins/ScGMTRawToDigi.cc +++ b/EventFilter/L1ScoutingRawToDigi/plugins/ScGMTRawToDigi.cc @@ -168,16 +168,7 @@ void ScGMTRawToDigi::unpackOrbit( std::cout << " Raw f: 0x" << std::hex << bl->mu[i].f << std::dec << "\n"; std::cout << " Raw s: 0x" << std::hex << bl->mu[i].s << std::dec << "\n"; std::cout << " Raw extra: 0x" << std::hex << bl->mu[i].extra << std::dec << "\n"; - std::cout << " Pt [GeV/Hw]: " << ugmt::fPt(muon.hwPt()) << "/" << muon.hwPt() << "\n"; - std::cout << " Eta [rad/Hw]: " << ugmt::fEta(muon.hwEta()) << "/" << muon.hwEta() << "\n"; - std::cout << " Phi [rad/Hw]: " << ugmt::fPhi(muon.hwPhi()) << "/" << muon.hwPhi() << "\n"; - std::cout << " Charge/valid: " << muon.hwCharge() << "/" << muon.hwChargeValid() << "\n"; - std::cout << " PhiVtx [rad/Hw]: " << ugmt::fPhiAtVtx(muon.hwPhiAtVtx()) << "/" << muon.hwPhiAtVtx() << "\n"; - std::cout << " EtaVtx [rad/Hw]: " << ugmt::fEtaAtVtx(muon.hwEtaAtVtx()) << "/" << muon.hwEtaAtVtx() << "\n"; - std::cout << " Pt uncon[GeV/Hw]: " << ugmt::fPtUnconstrained(muon.hwPtUnconstrained()) << "/" << muon.hwPtUnconstrained() << "\n"; - std::cout << " Dxy: " << muon.hwDXY() << "\n"; - std::cout << " Qual: " << muon.hwQual() << "\n"; - std::cout << " TF index: " << muon.tfMuonIndex() << "\n"; + printScMuon(muon); } } // end of bx diff --git a/EventFilter/L1ScoutingRawToDigi/plugins/ScGMTRawToDigi.h b/EventFilter/L1ScoutingRawToDigi/plugins/ScGMTRawToDigi.h index 43ec20ef66168..abe5299017bd1 100644 --- a/EventFilter/L1ScoutingRawToDigi/plugins/ScGMTRawToDigi.h +++ b/EventFilter/L1ScoutingRawToDigi/plugins/ScGMTRawToDigi.h @@ -13,10 +13,9 @@ #include "DataFormats/L1Scouting/interface/L1ScoutingMuon.h" #include "EventFilter/L1ScoutingRawToDigi/interface/shifts.h" -#include "EventFilter/L1ScoutingRawToDigi/interface/scales.h" #include "EventFilter/L1ScoutingRawToDigi/interface/masks.h" #include "EventFilter/L1ScoutingRawToDigi/interface/blocks.h" -#include "EventFilter/L1ScoutingRawToDigi/interface/conversion.h" +#include "L1TriggerScouting/Utilities/interface/printScObjects.h" #include #include diff --git a/EventFilter/Utilities/test/testScoutingRun3_daqsource.py b/EventFilter/Utilities/test/testScoutingRun3_daqsource.py deleted file mode 100644 index ed31287924bb7..0000000000000 --- a/EventFilter/Utilities/test/testScoutingRun3_daqsource.py +++ /dev/null @@ -1,128 +0,0 @@ -from __future__ import print_function -import FWCore.ParameterSet.Config as cms -import FWCore.ParameterSet.VarParsing as VarParsing -import os, sys - -options = VarParsing.VarParsing ("analysis") - -options.register ("runNumber", - 368636, - VarParsing.VarParsing.multiplicity.singleton, - VarParsing.VarParsing.varType.int, - "Run Number") - -options.register ("daqSourceMode", - "ScoutingRun3", - VarParsing.VarParsing.multiplicity.singleton, - VarParsing.VarParsing.varType.string, - "DAQ source data mode") - -options.register ("buBaseDir", - "/dev/shm", - VarParsing.VarParsing.multiplicity.singleton, - VarParsing.VarParsing.varType.string, - "BU base directory") - -options.register ("fuBaseDir", - "/tmp/", - VarParsing.VarParsing.multiplicity.singleton, - VarParsing.VarParsing.varType.string, - "BU base directory") - -options.register ("fffBaseDir", - "/dev/shm", - VarParsing.VarParsing.multiplicity.singleton, - VarParsing.VarParsing.varType.string, - "FFF base directory") - -options.register ("numThreads", - 2, - VarParsing.VarParsing.multiplicity.singleton, - VarParsing.VarParsing.varType.int, - "Number of CMSSW threads") - -options.register ("numFwkStreams", - 2, - VarParsing.VarParsing.multiplicity.singleton, - VarParsing.VarParsing.varType.int, - "Number of CMSSW streams") - -options.parseArguments() - -cmsswbase = os.path.expandvars("$CMSSW_BASE/") - -process = cms.Process("SCPU") -process.maxEvents = cms.untracked.PSet( - input = cms.untracked.int32(-1) -) - -process.options = cms.untracked.PSet( - wantSummary = cms.untracked.bool(True), - numberOfThreads = cms.untracked.uint32(options.numThreads), - numberOfStreams = cms.untracked.uint32(options.numFwkStreams), - numberOfConcurrentLuminosityBlocks = cms.untracked.uint32(1) -) -process.MessageLogger = cms.Service("MessageLogger", - cout = cms.untracked.PSet( - threshold = cms.untracked.string( "INFO" ) - ), - destinations = cms.untracked.vstring( "cout" ), -) - -process.FastMonitoringService = cms.Service("FastMonitoringService", - sleepTime = cms.untracked.int32(1) -) - -process.EvFDaqDirector = cms.Service("EvFDaqDirector", - useFileBroker = cms.untracked.bool(False), - buBaseDirsAll = cms.untracked.vstring( - options.buBaseDir - ), - buBaseDirsNumStreams = cms.untracked.vint32( - 2 - ), - fileBrokerHostFromCfg = cms.untracked.bool(True), - fileBrokerHost = cms.untracked.string("htcp40.cern.ch"), - runNumber = cms.untracked.uint32(options.runNumber), - baseDir = cms.untracked.string(options.fffBaseDir+"/"+options.fuBaseDir), - buBaseDir = cms.untracked.string(options.fffBaseDir+"/"+options.buBaseDir), - directorIsBU = cms.untracked.bool(False), -) - -try: - os.makedirs(options.fffBaseDir+"/"+options.fuBaseDir+"/run"+str(options.runNumber).zfill(6)) -except Exception as ex: - print(str(ex)) - pass - -ram_dir_path=options.buBaseDir+"/run"+str(options.runNumber).zfill(6)+"/" -flist = [ - ram_dir_path + "run" + str(options.runNumber) + "_ls0340_index000001.raw" -] - -process.source = cms.Source("DAQSource", - testing = cms.untracked.bool(True), - dataMode = cms.untracked.string(options.daqSourceMode), - verifyChecksum = cms.untracked.bool(False), - useL1EventID = cms.untracked.bool(False), - eventChunkBlock = cms.untracked.uint32(64), - eventChunkSize = cms.untracked.uint32(128), - maxChunkSize = cms.untracked.uint32(256), - numBuffers = cms.untracked.uint32(2), - maxBufferedFiles = cms.untracked.uint32(2), - fileListMode = cms.untracked.bool(True), - fileNames = cms.untracked.vstring(*flist) - -) - -process.outputZB = cms.OutputModule("PoolOutputModule", - fileName = cms.untracked.string('file:PoolOutputTest.root'), - outputCommands = cms.untracked.vstring( - "drop *", - "keep *_rawDataCollector_*_*" - ) -) - -process.ep = cms.EndPath( - process.outputZB -) \ No newline at end of file diff --git a/EventFilter/Utilities/test/testScoutingRun3_unpackers.py b/EventFilter/Utilities/test/testScoutingRun3_unpackers.py index eece932ed8623..c5b73cd91d2cc 100644 --- a/EventFilter/Utilities/test/testScoutingRun3_unpackers.py +++ b/EventFilter/Utilities/test/testScoutingRun3_unpackers.py @@ -53,7 +53,7 @@ process = cms.Process("SCPU") process.maxEvents = cms.untracked.PSet( - input = cms.untracked.int32(1) + input = cms.untracked.int32(-1) ) process.options = cms.untracked.PSet( @@ -102,7 +102,7 @@ ram_dir_path=options.buBaseDir+"/run"+str(options.runNumber).zfill(6)+"/" flist = [ - ram_dir_path + "run" + str(options.runNumber) + "_ls0340_index000001.raw"#"_ls0340_index000028.raw" + ram_dir_path + "run" + str(options.runNumber) + "_ls0340_index000028.raw" ] process.source = cms.Source("DAQSource", @@ -129,19 +129,19 @@ process.GmtUnpacker = cms.EDProducer('ScGMTRawToDigi', srcInputTag = cms.InputTag('rawDataCollector'), - debug=cms.untracked.bool(False) + debug = cms.untracked.bool(False) ) process.CaloUnpacker = cms.EDProducer('ScCaloRawToDigi', srcInputTag = cms.InputTag('rawDataCollector'), - debug=cms.untracked.bool(False) + enableAllSums = cms.untracked.bool(True), + debug = cms.untracked.bool(False) ) process.outputZB = cms.OutputModule("PoolOutputModule", fileName = cms.untracked.string('file:/dev/shm/PoolOutputTest.root'), outputCommands = cms.untracked.vstring( "drop *", - #"keep *_rawDataCollector_*_*", "keep *_GmtUnpacker_*_*", "keep *_CaloUnpacker_*_*" ), diff --git a/EventFilter/L1ScoutingRawToDigi/interface/conversion.h b/L1TriggerScouting/Utilities/interface/conversion.h similarity index 79% rename from EventFilter/L1ScoutingRawToDigi/interface/conversion.h rename to L1TriggerScouting/Utilities/interface/conversion.h index a240dafd3f42c..87b072ee3e1f3 100644 --- a/EventFilter/L1ScoutingRawToDigi/interface/conversion.h +++ b/L1TriggerScouting/Utilities/interface/conversion.h @@ -1,7 +1,8 @@ -#ifndef L1ScoutingRawToDigi_conversion_h -#define L1ScoutingRawToDigi_conversion_h +#ifndef L1TriggerScouting_Utilities_conversion_h +#define L1TriggerScouting_Utilities_conversion_h -#include "EventFilter/L1ScoutingRawToDigi/interface/scales.h" +#include "L1TriggerScouting/Utilities/interface/scales.h" +#include namespace l1ScoutingRun3 { @@ -19,7 +20,6 @@ namespace l1ScoutingRun3 { return scales::eta_scale*hwEta; }; inline float fPhi(int hwPhi) { - //float fPhi_ = scales::phi_scale*hwPhi; return _setPhiRange(scales::phi_scale*hwPhi); }; inline float fPtUnconstrained(int hwPtUnconstrained) { @@ -29,7 +29,6 @@ namespace l1ScoutingRun3 { return scales::eta_scale*hwEtaAtVtx; }; inline float fPhiAtVtx(int hwPhiAtVtx) { - //float fPhi_ = scales::phi_scale*hwPhiAtVtx; return _setPhiRange(scales::phi_scale*hwPhiAtVtx); }; @@ -44,7 +43,6 @@ namespace l1ScoutingRun3 { return scales::eta_scale*hwEta; }; inline float fPhi(int hwPhi) { - //float fPhi_ = scales::phi_scale*hwPhi; return _setPhiRange(scales::phi_scale*hwPhi); }; diff --git a/L1TriggerScouting/Utilities/interface/printScObjects.h b/L1TriggerScouting/Utilities/interface/printScObjects.h new file mode 100644 index 0000000000000..148303969f297 --- /dev/null +++ b/L1TriggerScouting/Utilities/interface/printScObjects.h @@ -0,0 +1,20 @@ +#ifndef L1TriggerScouting_Utilities_printScObjects_h +#define L1TriggerScouting_Utilities_printScObjects_h + +#include "DataFormats/L1Scouting/interface/L1ScoutingMuon.h" +#include "DataFormats/L1Scouting/interface/L1ScoutingCalo.h" +#include "L1TriggerScouting/Utilities/interface/conversion.h" + +namespace l1ScoutingRun3 { + + void printScMuon(const ScMuon& muon, std::ostream &outs = std::cout); + template + void printScCaloObject(const T& obj, std::ostream &outs = std::cout); + void printScJet(const ScJet& jet, std::ostream &outs = std::cout); + void printScEGamma(const ScEGamma& eGamma, std::ostream &outs = std::cout); + void printScTau(const ScTau& tau, std::ostream &outs = std::cout); + void printScBxSums(const ScBxSums& sums, std::ostream &outs = std::cout); + +} // end namespace L1ScoutingRun3 + +#endif // L1TriggerScouting_Utilities_printScObjects_h \ No newline at end of file diff --git a/EventFilter/L1ScoutingRawToDigi/interface/scales.h b/L1TriggerScouting/Utilities/interface/scales.h similarity index 76% rename from EventFilter/L1ScoutingRawToDigi/interface/scales.h rename to L1TriggerScouting/Utilities/interface/scales.h index bdc9aa0e225cf..c335ce7293e88 100644 --- a/EventFilter/L1ScoutingRawToDigi/interface/scales.h +++ b/L1TriggerScouting/Utilities/interface/scales.h @@ -1,11 +1,13 @@ -#ifndef L1ScoutingRawToDigi_scales_h -#define L1ScoutingRawToDigi_scales_h +#ifndef L1TriggerScouting_Utilities_scales_h +#define L1TriggerScouting_Utilities_scales_h #include #include namespace l1ScoutingRun3 { + // Scaled used to convert scouting hw values to physical quantities + namespace ugmt { struct scales { static constexpr float pt_scale = 0.5; @@ -25,4 +27,4 @@ namespace l1ScoutingRun3 { } } -#endif // L1ScoutingRawToDigi_scales_h +#endif // L1TriggerScouting_Utilities_scales_h diff --git a/L1TriggerScouting/Utilities/plugins/BuildFile.xml b/L1TriggerScouting/Utilities/plugins/BuildFile.xml index 2a4e53b8cc764..2e16c87937d04 100644 --- a/L1TriggerScouting/Utilities/plugins/BuildFile.xml +++ b/L1TriggerScouting/Utilities/plugins/BuildFile.xml @@ -1,9 +1,8 @@ - - - - - - - - - + + + + + + + + \ No newline at end of file diff --git a/L1TriggerScouting/Utilities/plugins/DumpScObjects.cc b/L1TriggerScouting/Utilities/plugins/DumpScObjects.cc index 52a3545b26931..25b0b2f08079a 100644 --- a/L1TriggerScouting/Utilities/plugins/DumpScObjects.cc +++ b/L1TriggerScouting/Utilities/plugins/DumpScObjects.cc @@ -19,8 +19,7 @@ #include "DataFormats/L1Scouting/interface/OrbitCollection.h" #include "DataFormats/L1Scouting/interface/L1ScoutingMuon.h" #include "DataFormats/L1Scouting/interface/L1ScoutingCalo.h" -#include "DataFormats/L1Trigger/interface/EtSum.h" -#include "EventFilter/L1ScoutingRawToDigi/interface/conversion.h" +#include "L1TriggerScouting/Utilities/interface/printScObjects.h" using namespace l1ScoutingRun3; @@ -37,11 +36,7 @@ class DumpScObjects : public edm::stream::EDAnalyzer<> { private: - void printMuon(const ScMuon* muon); - template - void printCaloObject(const T* obj); - void printCaloSum(const ScEtSum* sum); - + // dump contenct of BX void printBx(unsigned bx); // the tokens to access the data @@ -49,13 +44,13 @@ class DumpScObjects : public edm::stream::EDAnalyzer<> { edm::EDGetTokenT caloJetsToken_; edm::EDGetTokenT caloEGammasToken_; edm::EDGetTokenT caloTausToken_; - edm::EDGetTokenT caloEtSumsToken_; + edm::EDGetTokenT caloEtSumsToken_; edm::Handle muonHandle_; edm::Handle jetHandle_; edm::Handle eGammaHandle_; edm::Handle tauHandle_; - edm::Handle etSumHandle_; + edm::Handle etSumHandle_; // the min and max BX to be analyzed unsigned minBx_; @@ -104,7 +99,7 @@ DumpScObjects::DumpScObjects(const edm::ParameterSet& iConfig): if (checkJets_) caloJetsToken_ = consumes(iConfig.getParameter("caloJetsTag")); if (checkEGammas_) caloEGammasToken_ = consumes(iConfig.getParameter("caloEGammasTag")); if (checkTaus_) caloTausToken_ = consumes(iConfig.getParameter("caloTausTag")); - if (checkEtSums_) caloEtSumsToken_ = consumes(iConfig.getParameter("caloEtSumsTag")); + if (checkEtSums_) caloEtSumsToken_ = consumes(iConfig.getParameter("caloEtSumsTag")); } // ----------------------------------------------------------------------------- @@ -179,55 +174,6 @@ void DumpScObjects::analyze(const edm::Event& iEvent, const edm::EventSetup& evS } // ----------------------------------------------------------------------------- -void DumpScObjects::printMuon(const ScMuon* muon){ - std::cout << " Pt [GeV/Hw]: " << ugmt::fPt(muon->hwPt()) << "/" << muon->hwPt() << "\n"; - std::cout << " Eta [rad/Hw]: " << ugmt::fEta(muon->hwEta()) << "/" << muon->hwEta() << "\n"; - std::cout << " Phi [rad/Hw]: " << ugmt::fPhi(muon->hwPhi()) << "/" << muon->hwPhi() << "\n"; - std::cout << " Charge/valid: " << muon->hwCharge() << "/" << muon->hwChargeValid() << "\n"; - std::cout << " PhiVtx [rad/Hw]: " << ugmt::fPhiAtVtx(muon->hwPhiAtVtx()) << "/" << muon->hwPhiAtVtx() << "\n"; - std::cout << " EtaVtx [rad/Hw]: " << ugmt::fEtaAtVtx(muon->hwEtaAtVtx()) << "/" << muon->hwEtaAtVtx() << "\n"; - std::cout << " Pt uncon[GeV/Hw]: " << ugmt::fPtUnconstrained(muon->hwPtUnconstrained()) << "/" << muon->hwPtUnconstrained() << "\n"; - std::cout << " Dxy: " << muon->hwDXY() << "\n"; - std::cout << " Qual: " << muon->hwQual() << "\n"; - std::cout << " TF index: " << muon->tfMuonIndex() << "\n"; -} - -template -void DumpScObjects::printCaloObject(const T* obj){ - std::cout << " Et [GeV/Hw]: " << demux::fEt(obj->hwEt()) << "/" << obj->hwEt() << "\n"; - std::cout << " Eta [rad/Hw]: " << demux::fEta(obj->hwEta()) << "/" << obj->hwEta() << "\n"; - std::cout << " Phi [rad/Hw]: " << demux::fPhi(obj->hwPhi()) << "/" << obj->hwPhi() << "\n"; - std::cout << " Iso [Hw]: " << obj->hwIso() << "\n"; -} - -void DumpScObjects::printCaloSum(const ScEtSum* sum){ - - if (sum->type() == l1t::EtSum::kTotalEt){ - std::cout << "Type: TotalET\n" - << " Et [GeV/Hw]: " << demux::fEt(sum->hwEt()) << "/" << sum->hwEt() - << std::endl; - } - if (sum->type() == l1t::EtSum::kTotalHt){ - std::cout << "Type: TotalHT\n" - << " Et [GeV/Hw]: " << demux::fEt(sum->hwEt()) << "/" << sum->hwEt() - << std::endl; - } - - if (sum->type() == l1t::EtSum::kMissingEt){ - std::cout << "Type: ETMiss\n" - << " Et [GeV/Hw]: " << demux::fEt(sum->hwEt()) << "/" << sum->hwEt() << "\n" - << " Phi [Rad/Hw]: " << demux::fPhi(sum->hwPhi()) << "/" << sum->hwPhi() - << std::endl; - } - - if (sum->type() == l1t::EtSum::kMissingHt){ - std::cout << "Type: HTMiss\n" - << " Et [GeV/Hw]: " << demux::fEt(sum->hwEt()) << "/" << sum->hwEt() << "\n" - << " Phi [Rad/Hw]: " << demux::fPhi(sum->hwPhi()) << "/" << sum->hwPhi() - << std::endl; - } -} - void DumpScObjects::printBx(unsigned bx){ std::cout << "BX = " << bx <<" ****" << std::endl; @@ -235,7 +181,7 @@ void DumpScObjects::printBx(unsigned bx){ int i=0; for (auto muon = muonHandle_->begin(bx); muon!=muonHandle_->end(bx); muon++){ std::cout << "--- Muon " << i << " ---\n"; - printMuon(&*muon); + printScMuon(*muon); i++; } } @@ -244,7 +190,7 @@ void DumpScObjects::printBx(unsigned bx){ int i=0; for (auto jet = jetHandle_->begin(bx); jet!=jetHandle_->end(bx); jet++){ std::cout << "--- Jet " << i << " ---\n"; - printCaloObject(&*jet); + printScJet(*jet); i++; } } @@ -253,7 +199,7 @@ void DumpScObjects::printBx(unsigned bx){ int i=0; for (auto egamma = eGammaHandle_->begin(bx); egamma!=eGammaHandle_->end(bx); egamma++){ std::cout << "--- E/Gamma " << i << " ---\n"; - printCaloObject(&*egamma); + printScEGamma(*egamma); i++; } } @@ -262,7 +208,7 @@ void DumpScObjects::printBx(unsigned bx){ int i=0; for (auto tau = tauHandle_->begin(bx); tau!=tauHandle_->end(bx); tau++){ std::cout << "--- Tau " << i << " ---\n"; - printCaloObject(&*tau); + printScTau(*tau); i++; } } @@ -270,8 +216,8 @@ void DumpScObjects::printBx(unsigned bx){ if(checkEtSums_ && etSumHandle_.isValid()){ int i=0; for (auto sum = etSumHandle_->begin(bx); sum!=etSumHandle_->end(bx); sum++){ - std::cout << "--- Sum " << i << " ---\n"; - printCaloSum(&*sum); + std::cout << "--- Calo Sums ---\n"; + printScBxSums(*sum); i++; } } diff --git a/L1TriggerScouting/Utilities/src/printScObjects.cc b/L1TriggerScouting/Utilities/src/printScObjects.cc new file mode 100644 index 0000000000000..87c3ecf1b2193 --- /dev/null +++ b/L1TriggerScouting/Utilities/src/printScObjects.cc @@ -0,0 +1,76 @@ +#include "L1TriggerScouting/Utilities/interface/printScObjects.h" + +namespace l1ScoutingRun3 { + + void printScMuon(const ScMuon& muon, std::ostream &outs){ + outs << " Pt [GeV/Hw]: " << ugmt::fPt(muon.hwPt()) << "/" << muon.hwPt() << "\n" + << " Eta [rad/Hw]: " << ugmt::fEta(muon.hwEta()) << "/" << muon.hwEta() << "\n" + << " Phi [rad/Hw]: " << ugmt::fPhi(muon.hwPhi()) << "/" << muon.hwPhi() << "\n" + << " Charge/valid: " << muon.hwCharge() << "/" << muon.hwChargeValid() << "\n" + << " PhiVtx [rad/Hw]: " << ugmt::fPhiAtVtx(muon.hwPhiAtVtx()) << "/" << muon.hwPhiAtVtx() << "\n" + << " EtaVtx [rad/Hw]: " << ugmt::fEtaAtVtx(muon.hwEtaAtVtx()) << "/" << muon.hwEtaAtVtx() << "\n" + << " Pt uncon[GeV/Hw]: " << ugmt::fPtUnconstrained(muon.hwPtUnconstrained()) << "/" << muon.hwPtUnconstrained() << "\n" + << " Dxy: " << muon.hwDXY() << "\n" + << " Qual: " << muon.hwQual() << "\n" + << " TF index: " << muon.tfMuonIndex() << "\n"; + } + + template + void printScCaloObject(const T& obj, std::ostream &outs){ + outs << " Et [GeV/Hw]: " << demux::fEt(obj.hwEt()) << "/" << obj.hwEt() << "\n" + << " Eta [rad/Hw]: " << demux::fEta(obj.hwEta()) << "/" << obj.hwEta() << "\n" + << " Phi [rad/Hw]: " << demux::fPhi(obj.hwPhi()) << "/" << obj.hwPhi() << "\n" + << " Iso [Hw]: " << obj.hwIso() << "\n"; + } + + void printScJet(const ScJet& jet, std::ostream &outs){ + printScCaloObject(jet, outs); + } + void printScEGamma(const ScEGamma& eGamma, std::ostream &outs){ + printScCaloObject(eGamma, outs); + } + void printScTau(const ScTau& tau, std::ostream &outs){ + printScCaloObject(tau, outs); + } + + void printScBxSums(const ScBxSums& sums, std::ostream &outs){ + outs << "Total ET\n" + << " Et [GeV/Hw]: " << demux::fEt(sums.hwTotalEt()) << "/" << sums.hwTotalEt() << "\n" + << "Total ETEm\n" + << " Et [GeV/Hw]: " << demux::fEt(sums.hwTotalEtEm()) << "/" << sums.hwTotalEtEm() << "\n" + << "Total HT\n" + << " Et [GeV/Hw]: " << demux::fEt(sums.hwTotalHt()) << "/" << sums.hwTotalHt() << "\n" + << "Missing ET\n" + << " Et [GeV/Hw] : " << demux::fEt(sums.hwMissEt()) << "/" << sums.hwMissEt() << "\n" + << " Phi [Rad/Hw]: " << demux::fPhi(sums.hwMissEtPhi()) << "/" << sums.hwMissEtPhi() << "\n" + << "Missing HT\n" + << " Et [GeV/Hw] : " << demux::fEt(sums.hwMissHt()) << "/" << sums.hwMissHt() << "\n" + << " Phi [Rad/Hw]: " << demux::fPhi(sums.hwMissHtPhi()) << "/" << sums.hwMissHtPhi() << "\n" + << "Missing ETHF\n" + << " Et [GeV/Hw] : " << demux::fEt(sums.hwMissEtHF()) << "/" << sums.hwMissEtHF() << "\n" + << " Phi [Rad/Hw]: " << demux::fPhi(sums.hwMissEtHFPhi()) << "/" << sums.hwMissEtHFPhi() << "\n" + << "Missing HTHF\n" + << " Et [GeV/Hw] : " << demux::fEt(sums.hwMissHtHF()) << "/" << sums.hwMissHtHF() << "\n" + << " Phi [Rad/Hw]: " << demux::fPhi(sums.hwMissHtHFPhi()) << "/" << sums.hwMissHtHFPhi() << "\n" + << "AsymEt\n" + << " Et [GeV/Hw] : " << demux::fEt(sums.hwAsymEt()) << "/" << sums.hwAsymEt() << "\n" + << "AsymHt\n" + << " Et [GeV/Hw] : " << demux::fEt(sums.hwAsymHt()) << "/" << sums.hwAsymHt() << "\n" + << "AsymEtHF\n" + << " Et [GeV/Hw] : " << demux::fEt(sums.hwAsymEtHF()) << "/" << sums.hwAsymEtHF() << "\n" + << "AsymHtHF\n" + << " Et [GeV/Hw] : " << demux::fEt(sums.hwAsymHtHF()) << "/" << sums.hwAsymHtHF() << "\n" + << "MinBiasHFP0\n" + << " Hw: " << sums.minBiasHFP0() << "\n" + << "MinBiasHFM0\n" + << " Hw: " << sums.minBiasHFM0() << "\n" + << "MinBiasHFP1\n" + << " Hw: " << sums.minBiasHFP1() << "\n" + << "MinBiasHFM1\n" + << " Hw: " << sums.minBiasHFM1() << "\n" + << "Centrality\n" + << " Hw: " << sums.centrality() << "\n" + << "Tower Count\n" + << " Hw: " << sums.towerCount() << "\n"; + } +} \ No newline at end of file diff --git a/L1TriggerScouting/Utilities/test/dumpScObjects.py b/L1TriggerScouting/Utilities/test/dumpScObjects.py index ff40699c4876b..957ac3d77e7a2 100644 --- a/L1TriggerScouting/Utilities/test/dumpScObjects.py +++ b/L1TriggerScouting/Utilities/test/dumpScObjects.py @@ -44,9 +44,9 @@ #checkMuons = cms.untracked.bool(False), # test removing a collection searchEvent = cms.untracked.bool(True), - orbitNumber = cms.untracked.uint32(88982581), - searchStartBx = cms.untracked.uint32(1484-2), - searchStopBx = cms.untracked.uint32(1484+2), + orbitNumber = cms.untracked.uint32(88981531), + searchStartBx = cms.untracked.uint32(1027-2), + searchStopBx = cms.untracked.uint32(1027+2), ) process.p = cms.Path(