Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix SiPixelCalCosmics for Run3: logical mistake in DetStatus [12_0_X] #35379

Merged
merged 2 commits into from
Sep 24, 2021
Merged

fix SiPixelCalCosmics for Run3: logical mistake in DetStatus [12_0_X] #35379

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
966557b
fix SiPixelCalCosmics for Run3: logical mistake in DetStatus
mmusich Sep 22, 2021
a89a2b3
simplify logic for AndOr in DetStatus
mmusich Sep 23, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions Calibration/TkAlCaRecoProducers/python/ALCARECOSiPixelCalCosmics_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
ALCARECOSiPixelCalCosmicsDCSFilter = DPGAnalysis.Skims.skim_detstatus_cfi.dcsstatus.clone(
DetectorType = cms.vstring('BPIX','FPIX'),
ApplyFilter = cms.bool(True),
AndOr = cms.bool(True),
AndOr = cms.bool(False), # if True put partitions in AND, otherwise in OR
DebugOn = cms.untracked.bool(False)
)

Expand Down Expand Up @@ -38,4 +38,6 @@
ALCARECOSiPixelCalCosmics.minHitsPerSubDet.inPIXEL = 1

# Sequence #
seqALCARECOSiPixelCalCosmics = cms.Sequence(ALCARECOSiPixelCalCosmicsDCSFilter+ALCARECOSiPixelCalCosmicsHLTFilter*ALCARECOSiPixelCalCosmics)
seqALCARECOSiPixelCalCosmics = cms.Sequence(ALCARECOSiPixelCalCosmicsDCSFilter*
ALCARECOSiPixelCalCosmicsHLTFilter*
ALCARECOSiPixelCalCosmics)
15 changes: 11 additions & 4 deletions DPGAnalysis/Skims/src/DetStatus.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ DetStatus::DetStatus(const edm::ParameterSet& pset) {
//
// -- Destructor
//
DetStatus::~DetStatus() {}
DetStatus::~DetStatus() = default;

//*********************************************************************//
bool DetStatus::checkForDCSStatus(const DcsStatusCollection& dcsStatus)
Expand Down Expand Up @@ -116,17 +116,23 @@ bool DetStatus::checkForDCSRecord(const DCSRecord& dcsRecord)
}

for (unsigned int detlist = 0; detlist < DcsStatus::nPartitions; detlist++) {
if (verbose_)
edm::LogInfo("DetStatus") << "testing " << DcsStatus::partitionName[detlist];
if (requestedPartitions_.test(detlist)) {
if (verbose_)
edm::LogInfo("DetStatus") << " " << DcsStatus::partitionName[detlist] << "in the requested list" << std::endl;
if (AndOr_) {
accepted = (accepted & dcsRecord.highVoltageReady(detlist));
accepted = dcsRecord.highVoltageReady(detlist);
if (!accepted)
break;
} else {
accepted = (accepted || dcsRecord.highVoltageReady(detlist));
}
}
}

if (verbose_) {
edm::LogInfo("DetStatus") << "DCSStatus filter: " << accepted << "( AndOr: " << AndOr_ << ")" << std::endl;
edm::LogInfo("DetStatus") << "DCSStatus filter: " << accepted << " ( AndOr: " << AndOr_ << ")" << std::endl;
edm::LogVerbatim("DetStatus") << "Partitions ON: ";
for (unsigned int detlist = 0; detlist < DcsStatus::nPartitions; detlist++) {
if ((dcsRecord.highVoltageReady(detlist))) {
Expand Down Expand Up @@ -154,11 +160,12 @@ bool DetStatus::filter(edm::Event& evt, edm::EventSetup const& es)
edm::Handle<DCSRecord> dcsRecord;
evt.getByToken(dcsRecordToken_, dcsRecord);

// if the old style DCS status is valid (Run1 + Run2)
if (dcsStatus.isValid() && !dcsStatus->empty()) {
accepted = checkForDCSStatus(*dcsStatus);
} else if (dcsRecord.isValid()) {
if (evt.eventAuxiliary().isRealData()) {
// in case of real data check for DCS
// in case of real data check for DCSRecord content (Run >=3)
accepted = checkForDCSRecord(*dcsRecord);
} else {
// in case of MC accept in any case
Expand Down