Skip to content

Commit

Permalink
Merge pull request #15606 from kpedro88/Phase1-DbHardcode2
Browse files Browse the repository at this point in the history 
Automatic emap in HCAL hardcode conditions
  • Loading branch information
@cmsbuild
cmsbuild committed Aug 30, 2016
2 parents ba7bdf3 + df0c1b3 commit 79e058c
Show file tree
Hide file tree
Showing 6 changed files with 53 additions and 285 deletions.
4 changes: 3 additions & 1 deletion CalibCalorimetry/HcalAlgos/interface/HcalDbHardcode.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@
#include "CondFormats/HcalObjects/interface/HcalTPChannelParameters.h"
#include "CalibCalorimetry/HcalAlgos/interface/HcalHardcodeParameters.h"

#include <vector>

/**
\class HcalDbHardcode
Expand Down Expand Up @@ -73,7 +75,7 @@ class HcalDbHardcode {
HcalRecoParam makeRecoParam (HcalGenericDetId fId);
HcalMCParam makeMCParam (HcalGenericDetId fId);
HcalTimingParam makeTimingParam (HcalGenericDetId fId);
void makeHardcodeMap(HcalElectronicsMap& emap);
void makeHardcodeMap(HcalElectronicsMap& emap, const std::vector<HcalGenericDetId>& cells);
void makeHardcodeDcsMap(HcalDcsMap& dcs_map);
void makeHardcodeFrontEndMap(HcalFrontEndMap& emap,
const std::vector<HcalGenericDetId>& cells);
Expand Down
305 changes: 29 additions & 276 deletions CalibCalorimetry/HcalAlgos/src/HcalDbHardcode.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -435,283 +435,36 @@ void HcalDbHardcode::makeHardcodeDcsMap(HcalDcsMap& dcs_map) {
HcalDcsDetId(HcalDcsForward, 1, 4, HcalDcsDetId::DYN8, 3));
}

void HcalDbHardcode::makeHardcodeMap(HcalElectronicsMap& emap) {

/* HBHE crate numbering */
int hbhecrate[EMAP_NHBHECR]={0,1,4,5,10,11,14,15,17};
/* HF crate numbering */
int hfcrate[EMAP_NHFCR]={2,9,12};
/* HO crate numbering */
int hocrate[EMAP_NHOCR]={3,7,6,13};
/* HBHE FED numbering of DCCs */
int fedhbhenum[EMAP_NHBHECR][2]={{702,703},{704,705},{700,701},
{706,707},{716,717},{708,709},
{714,715},{710,711},{712,713}};
/* HF FED numbering of DCCs */
int fedhfnum[EMAP_NHFCR][2]={{718,719},{720,721},{722,723}};
/* HO FED numbering of DCCs */
int fedhonum[EMAP_NHOCR][2]={{724,725},{726,727},{728,729},{730,731}};
/* HBHE/HF htr slot offsets for set of three htrs */
int ihslot[EMAP_NHSETS]={2,5,13,16};
/* HO htr slot offsets for three sets of four htrs */
int ihslotho[EMAP_NHSETSHO][EMAP_NHTRSHO]={{2,3,4,5},{6,7,13,14},{15,16,17,18}};
/* iphi (lower) starting index for each HBHE crate */
int ihbhephis[EMAP_NHBHECR]={11,19,3,27,67,35,59,43,51};
/* iphi (lower) starting index for each HF crate */
int ihfphis[EMAP_NHFCR]={3,27,51};
/* iphi (lower) starting index for each HO crate */
int ihophis[EMAP_NHOCR]={71,17,35,53};
/* ihbheetadepth - unique HBHE {eta,depth} assignments per fiber and fiber channel */
int ihbheetadepth[EMAP_NHTRS][EMAP_NTOPBOT][EMAP_NFBR][EMAP_NFCH][2]={
{{{{11,1},{ 7,1},{ 3,1}}, /* htr 0 (HB) -bot(+top) */
{{ 5,1},{ 1,1},{ 9,1}},
{{11,1},{ 7,1},{ 3,1}},
{{ 5,1},{ 1,1},{ 9,1}},
{{10,1},{ 6,1},{ 2,1}},
{{ 8,1},{ 4,1},{12,1}},
{{10,1},{ 6,1},{ 2,1}},
{{ 8,1},{ 4,1},{12,1}}},
{{{11,1},{ 7,1},{ 3,1}}, /* htr 0 (HB) +bot(-top) */
{{ 5,1},{ 1,1},{ 9,1}},
{{11,1},{ 7,1},{ 3,1}},
{{ 5,1},{ 1,1},{ 9,1}},
{{10,1},{ 6,1},{ 2,1}},
{{ 8,1},{ 4,1},{12,1}},
{{10,1},{ 6,1},{ 2,1}},
{{ 8,1},{ 4,1},{12,1}}}},
{{{{16,2},{15,2},{14,1}}, /* htr 1 (HBHE) -bot(+top) */
{{15,1},{13,1},{16,1}},
{{16,2},{15,2},{14,1}},
{{15,1},{13,1},{16,1}},
{{17,1},{16,3},{26,1}},
{{18,1},{18,2},{26,2}},
{{17,1},{16,3},{25,1}},
{{18,1},{18,2},{25,2}}},
{{{16,2},{15,2},{14,1}}, /* htr 1 (HBHE) +bot(-top) */
{{15,1},{13,1},{16,1}},
{{16,2},{15,2},{14,1}},
{{15,1},{13,1},{16,1}},
{{17,1},{16,3},{25,1}},
{{18,1},{18,2},{25,2}},
{{17,1},{16,3},{26,1}},
{{18,1},{18,2},{26,2}}}},
{{{{28,1},{28,2},{29,1}}, /* htr 2 (HE) -bot(+top) */
{{28,3},{24,2},{24,1}},
{{27,1},{27,2},{29,2}},
{{27,3},{23,2},{23,1}},
{{19,2},{20,1},{22,2}},
{{19,1},{20,2},{22,1}},
{{19,2},{20,1},{21,2}},
{{19,1},{20,2},{21,1}}},
{{{27,1},{27,2},{29,2}}, /* htr 2 (HE) +bot(-top) */
{{27,3},{23,2},{23,1}},
{{28,1},{28,2},{29,1}},
{{28,3},{24,2},{24,1}},
{{19,2},{20,1},{21,2}},
{{19,1},{20,2},{21,1}},
{{19,2},{20,1},{22,2}},
{{19,1},{20,2},{22,1}}}}
};
/* ihfetadepth - unique HF {eta,depth} assignments per fiber and fiber channel */
int ihfetadepth[EMAP_NTOPBOT][EMAP_NFBR][EMAP_NFCH][2]={
{{{33,1},{31,1},{29,1}}, /* top */
{{32,1},{30,1},{34,1}},
{{33,2},{31,2},{29,2}},
{{32,2},{30,2},{34,2}},
{{34,2},{32,2},{30,2}},
{{31,2},{29,2},{33,2}},
{{34,1},{32,1},{30,1}},
{{31,1},{29,1},{33,1}}},
{{{41,1},{37,1},{35,1}}, /* bot */
{{38,1},{36,1},{39,1}},
{{41,2},{37,2},{35,2}},
{{38,2},{36,2},{39,2}},
{{40,2},{38,2},{36,2}},
{{37,2},{35,2},{39,2}},
{{40,1},{38,1},{36,1}},
{{37,1},{35,1},{39,1}}}
};
/* ihoetasidephi - unique HO {eta,side,phi} assignments per fiber and fiber channel */
int ihoetasidephi[EMAP_NHTRSHO][EMAP_NTOPBOT][EMAP_NFBR][EMAP_NFCH][3]={
{{{{ 1,-1,0},{ 2,-1,0},{ 3,-1,0}}, /* htr 0 (HO) top */
{{ 1,-1,1},{ 2,-1,1},{ 3,-1,1}},
{{ 1,-1,2},{ 2,-1,2},{ 3,-1,2}},
{{ 1,-1,3},{ 2,-1,3},{ 3,-1,3}},
{{ 1,-1,4},{ 2,-1,4},{ 3,-1,4}},
{{ 1,-1,5},{ 2,-1,5},{ 3,-1,5}},
{{14, 1,0},{14, 1,1},{14, 1,2}},
{{14, 1,3},{14, 1,4},{14, 1,5}}},
{{{ 1, 1,0},{ 2, 1,0},{ 3, 1,0}}, /* htr 0 (HO) bot */
{{ 1, 1,1},{ 2, 1,1},{ 3, 1,1}},
{{ 1, 1,2},{ 2, 1,2},{ 3, 1,2}},
{{ 1, 1,3},{ 2, 1,3},{ 3, 1,3}},
{{ 1, 1,4},{ 2, 1,4},{ 3, 1,4}},
{{ 1, 1,5},{ 2, 1,5},{ 3, 1,5}},
{{15, 1,0},{15, 1,1},{15, 1,2}},
{{15, 1,3},{15, 1,4},{15, 1,5}}}},
{{{{ 6, 1,0},{ 6, 1,1},{ 6, 1,2}}, /* htr 1 (HO) top */
{{ 6, 1,3},{ 6, 1,4},{ 6, 1,5}},
{{ 7, 1,0},{ 7, 1,1},{ 7, 1,2}},
{{ 7, 1,3},{ 7, 1,4},{ 7, 1,5}},
{{ 8, 1,0},{ 8, 1,1},{ 8, 1,2}},
{{ 8, 1,3},{ 8, 1,4},{ 8, 1,5}},
{{ 9, 1,0},{ 9, 1,1},{ 9, 1,2}},
{{ 9, 1,3},{ 9, 1,4},{ 9, 1,5}}},
{{{10, 1,0},{10, 1,1},{10, 1,2}}, /* htr 1 (HO) bot */
{{10, 1,3},{10, 1,4},{10, 1,5}},
{{11, 1,0},{11, 1,1},{11, 1,2}},
{{11, 1,3},{11, 1,4},{11, 1,5}},
{{12, 1,0},{12, 1,1},{12, 1,2}},
{{12, 1,3},{12, 1,4},{12, 1,5}},
{{13, 1,0},{13, 1,1},{13, 1,2}},
{{13, 1,3},{13, 1,4},{13, 1,5}}}},
{{{{ 4,-1,0},{ 4,-1,1},{ 0, 0,0}}, /* htr 2 (HO) top */
{{ 4,-1,2},{ 4,-1,3},{ 0, 0,0}},
{{ 4,-1,4},{ 4,-1,5},{ 0, 0,0}},
{{ 0, 0,0},{ 0, 0,0},{ 0, 0,0}},
{{ 5,-1,0},{ 5,-1,1},{ 5,-1,2}},
{{ 5,-1,3},{ 5,-1,4},{ 5,-1,5}},
{{14,-1,0},{14,-1,1},{14,-1,2}},
{{14,-1,3},{14,-1,4},{14,-1,5}}},
{{{ 4, 1,0},{ 4, 1,1},{ 0, 0,0}}, /* htr 2 (HO) bot */
{{ 4, 1,2},{ 4, 1,3},{ 0, 0,0}},
{{ 4, 1,4},{ 4, 1,5},{ 0, 0,0}},
{{ 0, 0,0},{ 0, 0,0},{ 0, 0,0}},
{{ 5, 1,0},{ 5, 1,1},{ 5, 1,2}},
{{ 5, 1,3},{ 5, 1,4},{ 5, 1,5}},
{{15,-1,0},{15,-1,1},{15,-1,2}},
{{15,-1,3},{15,-1,4},{15,-1,5}}}},
{{{{ 6,-1,0},{ 6,-1,1},{ 6,-1,2}}, /* htr 3 (HO) top */
{{ 6,-1,3},{ 6,-1,4},{ 6,-1,5}},
{{ 7,-1,0},{ 7,-1,1},{ 7,-1,2}},
{{ 7,-1,3},{ 7,-1,4},{ 7,-1,5}},
{{ 8,-1,0},{ 8,-1,1},{ 8,-1,2}},
{{ 8,-1,3},{ 8,-1,4},{ 8,-1,5}},
{{ 9,-1,0},{ 9,-1,1},{ 9,-1,2}},
{{ 9,-1,3},{ 9,-1,4},{ 9,-1,5}}},
{{{10,-1,0},{10,-1,1},{10,-1,2}}, /* htr 3 (HO) bot */
{{10,-1,3},{10,-1,4},{10,-1,5}},
{{11,-1,0},{11,-1,1},{11,-1,2}},
{{11,-1,3},{11,-1,4},{11,-1,5}},
{{12,-1,0},{12,-1,1},{12,-1,2}},
{{12,-1,3},{12,-1,4},{12,-1,5}},
{{13,-1,0},{13,-1,1},{13,-1,2}},
{{13,-1,3},{13,-1,4},{13,-1,5}}}}
};
int ic,is,ih,itb,ifb,ifc,ifwtb,iphi_loc;
int iside,ieta,iphi,idepth,icrate,ihtr,ihtr_fi,ifi_ch,ispigot,idcc,ifed;
// int idcc_sl;
std::string det;
std::string fpga;
// printf(" side eta phi depth det crate htr fpga htr_fi fi_ch spigo dcc dcc_sl fedid\n");
/* all HBHE crates */
for(ic=0; ic<EMAP_NHBHECR; ic++){
/* four sets of three htrs per crate */
for(is=0; is<EMAP_NHSETS; is++){
/* three htrs per set */
for(ih=0; ih<EMAP_NHTRS; ih++){
/* top and bottom */
for(itb=0; itb<EMAP_NTOPBOT; itb++){
/* eight fibers per HTR FPGA */
for(ifb=0; ifb<EMAP_NFBR; ifb++){
/* three channels per fiber */
for(ifc=0; ifc<EMAP_NFCH; ifc++){
icrate=hbhecrate[ic];
iside=is<EMAP_NHSETS/2?-1:1;
ifwtb=(is/2+itb+1)%2;
ieta=ihbheetadepth[ih][ifwtb][ifb][ifc][0];
idepth=ihbheetadepth[ih][ifwtb][ifb][ifc][1];
ihtr=ihslot[is]+ih;
det=((ieta>16||idepth>2)?("HE"):("HB"));
fpga=((itb%2)==1)?("bot"):("top");
ihtr_fi=ifb+1;
ifi_ch=ifc;
iphi=(ieta>20)?(ihbhephis[ic]+(is%2)*4+itb*2-1)%72+1:(ihbhephis[ic]+(is%2)*4+itb*2+(ifb/2+is/2+1)%2-1)%72+1;
ispigot=(is%2)*6+ih*2+itb;
idcc=is<EMAP_NHSETS/2?1:2;
// idcc_sl=idcc==1?9:19;
ifed=fedhbhenum[ic][idcc-1];
/// load map
HcalElectronicsId elId(ifi_ch, ihtr_fi, ispigot, ifed-700);
elId.setHTR(icrate, ihtr, (fpga=="top")?(1):(0));
HcalDetId hId((det=="HB")?(HcalBarrel):(HcalEndcap),ieta*iside,iphi,idepth);
emap.mapEId2chId(elId,hId);

// printf(" %9d %9d %9d %9d %9s %9d %9d %9s %9d %9d %9d %9d %9d %9d\n",iside,ieta,iphi,idepth,&det,icrate,ihtr,&fpga,ihtr_fi,ifi_ch,ispigot,idcc,idcc_sl,ifed);
}}}}}}
/* all HF crates */
for(ic=0; ic<EMAP_NHFCR; ic++){
/* four sets of three htrs per crate */
for(is=0; is<EMAP_NHSETS; is++){
/* three htrs per set */
for(ih=0; ih<EMAP_NHTRS; ih++){
/* top and bottom */
for(itb=0; itb<EMAP_NTOPBOT; itb++){
/* eight fibers per HTR FPGA */
for(ifb=0; ifb<EMAP_NFBR; ifb++){
/* three channels per fiber */
for(ifc=0; ifc<EMAP_NFCH; ifc++){
icrate=hfcrate[ic];
iside=is<EMAP_NHSETS/2?-1:1;
ieta=ihfetadepth[itb][ifb][ifc][0];
idepth=ihfetadepth[itb][ifb][ifc][1];
ihtr=ihslot[is]+ih;
det="HF";
fpga=((itb%2)==1)?("bot"):("top");
ihtr_fi=ifb+1;
ifi_ch=ifc;
iphi=(ieta>39)?(ihfphis[ic]+(is%2)*12+ih*4-3)%72+1:(ihfphis[ic]+(is%2)*12+ih*4+(ifb/4)*2-1)%72+1;
ispigot=(is%2)*6+ih*2+itb;
idcc=is<EMAP_NHSETS/2?1:2;
// idcc_sl=idcc==1?9:19;
ifed=fedhfnum[ic][idcc-1];
HcalElectronicsId elId(ifi_ch, ihtr_fi, ispigot, ifed-700);
elId.setHTR(icrate, ihtr, (fpga=="top")?(1):(0));
HcalDetId hId(HcalForward,ieta*iside,iphi,idepth);
emap.mapEId2chId(elId,hId);
// printf(" %9d %9d %9d %9d %9s %9d %9d %9s %9d %9d %9d %9d %9d %9d\n",iside,ieta,iphi,idepth,&det,icrate,ihtr,&fpga,ihtr_fi,ifi_ch,ispigot,idcc,idcc_sl,ifed);
}}}}}}
/* all HO crates */
for(ic=0; ic<EMAP_NHOCR; ic++){
/* three sets of four htrs per crate */
for(is=0; is<EMAP_NHSETSHO; is++){
/* four htrs per set */
for(ih=0; ih<EMAP_NHTRSHO; ih++){
/* top and bottom */
for(itb=0; itb<EMAP_NTOPBOT; itb++){
/* eight fibers per HTR FPGA */
for(ifb=0; ifb<EMAP_NFBR; ifb++){
/* three channels per fiber */
for(ifc=0; ifc<EMAP_NFCH; ifc++){
icrate=hocrate[ic];
idepth=1;
ieta=ihoetasidephi[ih][itb][ifb][ifc][0];
iside=ihoetasidephi[ih][itb][ifb][ifc][1];
iphi_loc=ihoetasidephi[ih][itb][ifb][ifc][2];
ihtr=ihslotho[is][ih];
det="HO";
fpga=((itb%2)==1)?("bot"):("top");
ihtr_fi=ifb+1;
ifi_ch=ifc;
iphi=(ihophis[ic]+is*6+iphi_loc-1)%72+1;
ispigot=ihtr<9?(ihtr-2)*2+itb:(ihtr-13)*2+itb;
idcc=ihtr<9?1:2;
// idcc_sl=idcc==1?9:19;
ifed=fedhonum[ic][idcc-1];
HcalElectronicsId elId(ifi_ch, ihtr_fi, ispigot, ifed-700);
elId.setHTR(icrate, ihtr, (fpga=="top")?(1):(0));
if (ieta==0) { // unmapped
emap.mapEId2chId(elId,DetId(HcalDetId::Undefined));
} else {
HcalDetId hId(HcalOuter,ieta*iside,iphi,idepth+3); // HO is officially "depth=4"
emap.mapEId2chId(elId,hId);
}
// printf(" %9d %9d %9d %9d %9s %9d %9d %9s %9d %9d %9d %9d %9d %9d\n",iside,ieta,iphi,idepth,&det,icrate,ihtr,&fpga,ihtr_fi,ifi_ch,ispigot,idcc,idcc_sl,ifed);
}}}}}}


void HcalDbHardcode::makeHardcodeMap(HcalElectronicsMap& emap, const std::vector<HcalGenericDetId>& cells) {
static const int kUTCAMask = 0x4000000; //set bit 26 for uTCA version
static const int kLinearIndexMax = 0x7FFFF; //19 bits
static const int kTriggerBitMask = 0x02000000; //2^25
uint32_t counter = 0;
uint32_t counterTrig = 0;
for(const auto& fId : cells){
if(fId.genericSubdet() == HcalGenericDetId::HcalGenBarrel ||
fId.genericSubdet() == HcalGenericDetId::HcalGenEndcap ||
fId.genericSubdet() == HcalGenericDetId::HcalGenForward ||
fId.genericSubdet() == HcalGenericDetId::HcalGenOuter ||
fId.genericSubdet() == HcalGenericDetId::HcalGenZDC)
{
++counter;
assert(counter < kLinearIndexMax);
uint32_t raw = counter;
raw |= kUTCAMask;
HcalElectronicsId elId(raw);
emap.mapEId2chId(elId,fId);
}
else if(fId.genericSubdet() == HcalGenericDetId::HcalGenTriggerTower){
++counterTrig;
assert(counterTrig < kLinearIndexMax);
uint32_t raw = counterTrig;
raw |= kUTCAMask | kTriggerBitMask;
HcalElectronicsId elId(raw);
emap.mapEId2tId(elId,fId);
}
}
emap.sort();

}

void HcalDbHardcode::makeHardcodeFrontEndMap(HcalFrontEndMap& emap, const std::vector<HcalGenericDetId>& cells) {
Expand Down
6 changes: 5 additions & 1 deletion CalibCalorimetry/HcalPlugins/src/HcalHardcodeCalibrations.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -557,9 +557,13 @@ std::unique_ptr<HcalL1TriggerObjects> HcalHardcodeCalibrations::produceL1Trigger

std::unique_ptr<HcalElectronicsMap> HcalHardcodeCalibrations::produceElectronicsMap (const HcalElectronicsMapRcd& rcd) {
edm::LogInfo("HCAL") << "HcalHardcodeCalibrations::produceElectronicsMap-> ...";
edm::ESHandle<HcalTopology> htopo;
rcd.getRecord<HcalRecNumberingRecord>().get(htopo);
const HcalTopology* topo=&(*htopo);

std::vector <HcalGenericDetId> cells = allCells(*topo);
auto result = std::make_unique<HcalElectronicsMap>();
dbHardcode.makeHardcodeMap(*result);
dbHardcode.makeHardcodeMap(*result,cells);
return result;
}

Expand Down
11 changes: 7 additions & 4 deletions CondFormats/DataRecord/interface/HcalElectronicsMapRcd.h
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
// this file is generated automatically by /afs/fnal.gov/files/home/room1/ratnikov/bin/makeNewClass.sh
// name: ratnikov, date: Tue Oct 18 18:59:54 CDT 2005
#ifndef HcalElectronicsMapRcd_H
#define HcalElectronicsMapRcd_H
#include "FWCore/Framework/interface/EventSetupRecordImplementation.h"
class HcalElectronicsMapRcd : public edm::eventsetup::EventSetupRecordImplementation<HcalElectronicsMapRcd> {};

#include "FWCore/Framework/interface/DependentRecordImplementation.h"
#include "Geometry/Records/interface/HcalRecNumberingRecord.h"
#include "Geometry/Records/interface/IdealGeometryRecord.h"

class HcalElectronicsMapRcd : public edm::eventsetup::DependentRecordImplementation<HcalElectronicsMapRcd, boost::mpl::vector<HcalRecNumberingRecord,IdealGeometryRecord> > {};

#endif
4 changes: 2 additions & 2 deletions CondFormats/HcalObjects/src/HcalElectronicsMap.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ const HcalElectronicsMap::PrecisionItem* HcalElectronicsMap::findById (unsigned

sortById();

auto ptr = (*mPItemsById.load(std::memory_order_acquire));
auto const& ptr = (*mPItemsById.load(std::memory_order_acquire));
item = std::lower_bound (ptr.begin(), ptr.end(), &target, hcal_impl::LessById());
if (item == ptr.end() || (*item)->mId != fId)
// throw cms::Exception ("Conditions not found") << "Unavailable Electronics map for cell " << fId;
Expand Down Expand Up @@ -93,7 +93,7 @@ const HcalElectronicsMap::TriggerItem* HcalElectronicsMap::findByTrigId (unsigne

sortByTriggerId();

auto ptr = (*mTItemsByTrigId.load(std::memory_order_acquire));
auto const& ptr = (*mTItemsByTrigId.load(std::memory_order_acquire));
item = std::lower_bound (ptr.begin(), ptr.end(), &target, hcal_impl::LessByTrigId());
if (item == (*mTItemsByTrigId).end() || (*item)->mTrigId != fTrigId)
// throw cms::Exception ("Conditions not found") << "Unavailable Electronics map for cell " << fId;
Expand Down
8 changes: 7 additions & 1 deletion SLHCUpgradeSimulations/Configuration/python/HCalCustoms.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,13 @@ def customise_Hcal2017(process):
process=customise_mixing(process)
if hasattr(process,'simHcalTriggerPrimitiveDigis'):
process.simHcalTriggerPrimitiveDigis.upgradeHF = cms.bool(True)

if hasattr(process,'dqmoffline_step'):
process.digiTask.tagHBHE = cms.untracked.InputTag("simHcalDigis")
process.digiTask.tagHF = cms.untracked.InputTag("simHcalDigis")
process.digiTask.tagHO = cms.untracked.InputTag("simHcalDigis")
if hasattr(process,'validation_step'):
process.AllHcalDigisValidation.digiLabel = cms.InputTag("simHcalDigis")

return process

#intermediate customization (HCAL 2017, HE and HF upgrades - w/ SiPMs & QIE11)
Expand Down

0 comments on commit 79e058c

Please sign in to comment.