diff --git a/DPGAnalysis/MuonTools/interface/MuDigiBaseProducer.h b/DPGAnalysis/MuonTools/interface/MuDigiBaseProducer.h index 27d161fa233c5..d29c71c61700c 100644 --- a/DPGAnalysis/MuonTools/interface/MuDigiBaseProducer.h +++ b/DPGAnalysis/MuonTools/interface/MuDigiBaseProducer.h @@ -24,7 +24,7 @@ class MuDigiBaseProducer : public SimpleFlatTableProducerBase, int>; using UIntDetVar = FuncVariable, unsigned int>; - using Int8DetVar = FuncVariable, int8_t>; + using Int16DetVar = FuncVariable, int16_t>; using UInt8DetVar = FuncVariable, uint8_t>; std::vector>> detIdVars_; @@ -44,8 +44,8 @@ class MuDigiBaseProducer : public SimpleFlatTableProducerBase(name, varCfg)); } else if (type == "uint") { detVarPtr = std::move(std::make_unique(name, varCfg)); - } else if (type == "int8") { - detVarPtr = std::move(std::make_unique(name, varCfg)); + } else if (type == "int16") { + detVarPtr = std::move(std::make_unique(name, varCfg)); } else if (type == "uint8") { detVarPtr = std::move(std::make_unique(name, varCfg)); } else { @@ -69,7 +69,7 @@ class MuDigiBaseProducer : public SimpleFlatTableProducerBase("doc")->setComment("few words description of the branch content"); variable.ifValue(edm::ParameterDescription("type", "int", true, comType), - edm::allowedValues("int", "uint", "int8", "uint8")); + edm::allowedValues("int", "uint", "int16", "uint8")); edm::ParameterSetDescription variables; diff --git a/DPGAnalysis/MuonTools/interface/MuLocalRecoBaseProducer.h b/DPGAnalysis/MuonTools/interface/MuLocalRecoBaseProducer.h index 318ba3c60477e..ba27733fc8e1f 100644 --- a/DPGAnalysis/MuonTools/interface/MuLocalRecoBaseProducer.h +++ b/DPGAnalysis/MuonTools/interface/MuLocalRecoBaseProducer.h @@ -40,7 +40,7 @@ class MuRecObjBaseProducer using IntDetVar = FuncVariable, int>; using UIntDetVar = FuncVariable, unsigned int>; - using Int8DetVar = FuncVariable, int8_t>; + using Int16DetVar = FuncVariable, int16_t>; using UInt8DetVar = FuncVariable, uint8_t>; std::vector>> detIdVars_; @@ -67,8 +67,8 @@ class MuRecObjBaseProducer detVarPtr = std::move(std::make_unique(name, varCfg)); // CB can improve? } else if (type == "uint") { detVarPtr = std::move(std::make_unique(name, varCfg)); - } else if (type == "int8") { - detVarPtr = std::move(std::make_unique(name, varCfg)); + } else if (type == "int16") { + detVarPtr = std::move(std::make_unique(name, varCfg)); } else if (type == "uint8") { detVarPtr = std::move(std::make_unique(name, varCfg)); } else { @@ -124,7 +124,7 @@ class MuRecObjBaseProducer edm::Comment comType{"the c++ type of the branch in the flat table"}; detIdVar.ifValue(edm::ParameterDescription{"type", "int", true, comType}, - edm::allowedValues("int", "uint", "int8", "uint8")); + edm::allowedValues("int", "uint", "int16", "uint8")); edm::Comment comPrecision{"the precision with which to store the value in the flat table"}; globalGeomVar.addOptionalNode(edm::ParameterDescription{"precision", true, comPrecision}, false); diff --git a/DPGAnalysis/MuonTools/plugins/MuDTMuonExtTableProducer.cc b/DPGAnalysis/MuonTools/plugins/MuDTMuonExtTableProducer.cc index 8ebcacb24c231..1982215368c9d 100644 --- a/DPGAnalysis/MuonTools/plugins/MuDTMuonExtTableProducer.cc +++ b/DPGAnalysis/MuonTools/plugins/MuDTMuonExtTableProducer.cc @@ -166,9 +166,9 @@ void MuDTMuonExtTableProducer::fillTable(edm::Event& ev) { std::vector staMatches_begin; std::vector staMatches_end; - std::vector matches_wheel; - std::vector matches_sector; - std::vector matches_station; + std::vector matches_wheel; + std::vector matches_sector; + std::vector matches_station; std::vector matches_x; std::vector matches_y; @@ -402,4 +402,4 @@ bool MuDTMuonExtTableProducer::hasTrigger(std::vector& trigIndices, #include "FWCore/PluginManager/interface/ModuleDef.h" #include "FWCore/Framework/interface/MakerMacros.h" -DEFINE_FWK_MODULE(MuDTMuonExtTableProducer); \ No newline at end of file +DEFINE_FWK_MODULE(MuDTMuonExtTableProducer); diff --git a/DPGAnalysis/MuonTools/plugins/MuDTSegmentExtTableProducer.cc b/DPGAnalysis/MuonTools/plugins/MuDTSegmentExtTableProducer.cc index b37ed891f7e93..2658d4c3c9dfc 100644 --- a/DPGAnalysis/MuonTools/plugins/MuDTSegmentExtTableProducer.cc +++ b/DPGAnalysis/MuonTools/plugins/MuDTSegmentExtTableProducer.cc @@ -145,7 +145,7 @@ void MuDTSegmentExtTableProducer::fillTable(edm::Event& ev) { std::vector seg4D_hitsExpPos; std::vector seg4D_hitsExpPosCh; - std::vector seg4D_hitsExpWire; + std::vector seg4D_hitsExpWire; // rec-hits vectors, filled if m_fillHits == true unsigned int nHits{0}; @@ -153,11 +153,11 @@ void MuDTSegmentExtTableProducer::fillTable(edm::Event& ev) { std::vector seg2D_hits_pos; std::vector seg2D_hits_posCh; std::vector seg2D_hits_posErr; - std::vector seg2D_hits_side; - std::vector seg2D_hits_wire; - std::vector seg2D_hits_wirePos; - std::vector seg2D_hits_layer; - std::vector seg2D_hits_superLayer; + std::vector seg2D_hits_side; + std::vector seg2D_hits_wire; + std::vector seg2D_hits_wirePos; + std::vector seg2D_hits_layer; + std::vector seg2D_hits_superLayer; std::vector seg2D_hits_time; std::vector seg2D_hits_timeCali; diff --git a/DPGAnalysis/MuonTools/plugins/MuDTTPGPhiFlatTableProducer.cc b/DPGAnalysis/MuonTools/plugins/MuDTTPGPhiFlatTableProducer.cc index 781cddeea2ea0..e876edf07c15a 100644 --- a/DPGAnalysis/MuonTools/plugins/MuDTTPGPhiFlatTableProducer.cc +++ b/DPGAnalysis/MuonTools/plugins/MuDTTPGPhiFlatTableProducer.cc @@ -77,12 +77,12 @@ void MuDTTPGPhiFlatTableProducer::getFromES(const edm::Run& run, const edm::Even void MuDTTPGPhiFlatTableProducer::fillTable(edm::Event& ev) { unsigned int nTrigs{0}; - std::vector wheel; - std::vector sector; - std::vector station; + std::vector wheel; + std::vector sector; + std::vector station; - std::vector quality; - std::vector rpcBit; + std::vector quality; + std::vector rpcBit; std::vector phi; std::vector phiB; @@ -90,8 +90,8 @@ void MuDTTPGPhiFlatTableProducer::fillTable(edm::Event& ev) { std::vector posLoc_x; std::vector dirLoc_phi; - std::vector bx; - std::vector is2nd; + std::vector bx; + std::vector is2nd; auto trigColl = m_token.conditionalGet(ev); diff --git a/DPGAnalysis/MuonTools/plugins/MuDTTPGThetaFlatTableProducer.cc b/DPGAnalysis/MuonTools/plugins/MuDTTPGThetaFlatTableProducer.cc index 95c0e9ce6fe83..31af63499abf1 100644 --- a/DPGAnalysis/MuonTools/plugins/MuDTTPGThetaFlatTableProducer.cc +++ b/DPGAnalysis/MuonTools/plugins/MuDTTPGThetaFlatTableProducer.cc @@ -63,11 +63,11 @@ void MuDTTPGThetaFlatTableProducer::fillDescriptions(edm::ConfigurationDescripti void MuDTTPGThetaFlatTableProducer::fillTable(edm::Event& ev) { unsigned int nTrigs{0}; - std::vector wheel; - std::vector sector; - std::vector station; + std::vector wheel; + std::vector sector; + std::vector station; - std::vector bx; + std::vector bx; std::vector hitMap; auto trigColl = m_token.conditionalGet(ev); @@ -152,4 +152,4 @@ MuDTTPGThetaFlatTableProducer::TriggerTag MuDTTPGThetaFlatTableProducer::getTag( #include "FWCore/PluginManager/interface/ModuleDef.h" #include "FWCore/Framework/interface/MakerMacros.h" -DEFINE_FWK_MODULE(MuDTTPGThetaFlatTableProducer); \ No newline at end of file +DEFINE_FWK_MODULE(MuDTTPGThetaFlatTableProducer); diff --git a/DPGAnalysis/MuonTools/plugins/MuGEMMuonExtTableProducer.cc b/DPGAnalysis/MuonTools/plugins/MuGEMMuonExtTableProducer.cc index 6b49b1c34cc8b..f7e96197b8885 100644 --- a/DPGAnalysis/MuonTools/plugins/MuGEMMuonExtTableProducer.cc +++ b/DPGAnalysis/MuonTools/plugins/MuGEMMuonExtTableProducer.cc @@ -115,10 +115,10 @@ void MuGEMMuonExtTableProducer::fillTable(edm::Event& ev) { std::vector propagated_isincoming; std::vector propagated_isinsideout; - std::vector propagated_region; - std::vector propagated_layer; - std::vector propagated_chamber; - std::vector propagated_etaP; + std::vector propagated_region; + std::vector propagated_layer; + std::vector propagated_chamber; + std::vector propagated_etaP; std::vector propagatedLoc_x; std::vector propagatedLoc_y; @@ -148,10 +148,10 @@ void MuGEMMuonExtTableProducer::fillTable(edm::Event& ev) { std::vector propagated_EtaPartition_rMax; std::vector propagated_EtaPartition_rMin; - std::vector propagated_nME1hits; - std::vector propagated_nME2hits; - std::vector propagated_nME3hits; - std::vector propagated_nME4hits; + std::vector propagated_nME1hits; + std::vector propagated_nME2hits; + std::vector propagated_nME3hits; + std::vector propagated_nME4hits; auto muons = m_token.conditionalGet(ev); @@ -237,10 +237,10 @@ void MuGEMMuonExtTableProducer::fillTable(edm::Event& ev) { //if at least one CSC hit is found, perform propagation if (is_csc) { // CSC Hits - int8_t nME1_hits = 0; - int8_t nME2_hits = 0; - int8_t nME3_hits = 0; - int8_t nME4_hits = 0; + int16_t nME1_hits = 0; + int16_t nME2_hits = 0; + int16_t nME3_hits = 0; + int16_t nME4_hits = 0; int nHits{htp.numberOfAllHits(htp.TRACK_HITS)}; diff --git a/DPGAnalysis/MuonTools/python/muNtupleProducer_cff.py b/DPGAnalysis/MuonTools/python/muNtupleProducer_cff.py index 001671e872ca3..2fa4cfbbd6391 100644 --- a/DPGAnalysis/MuonTools/python/muNtupleProducer_cff.py +++ b/DPGAnalysis/MuonTools/python/muNtupleProducer_cff.py @@ -11,14 +11,14 @@ muDPGNanoProducer = cms.Sequence(lhcInfoTableProducer + lumiTableProducer - + muDigiProducers - + muLocalRecoProducers + + muDigiProducers + + muLocalRecoProducers + muRecoProducers + muL1TriggerProducers ) - + def muDPGNanoCustomize(process) : - + if hasattr(process, "dtrpcPointFlatTableProducer") and \ hasattr(process, "cscrpcPointFlatTableProducer") and \ hasattr(process, "RawToDigiTask"): @@ -27,7 +27,7 @@ def muDPGNanoCustomize(process) : process.rpcPointProducer.cscSegments = 'cscSegments' process.rpcPointProducer.ExtrapolatedRegion = 0.6 process.RawToDigiTask.add(process.rpcPointProducer) - + if hasattr(process, "muGEMMuonExtTableProducer") or hasattr(process, "muCSCTnPFlatTableProducer"): process.load("TrackingTools/TransientTrack/TransientTrackBuilder_cfi") process.load("TrackPropagation.SteppingHelixPropagator.SteppingHelixPropagatorAny_cfi") diff --git a/DPGAnalysis/MuonTools/python/nano_mu_digi_cff.py b/DPGAnalysis/MuonTools/python/nano_mu_digi_cff.py index 1be4ef59d022e..5c8c16139805f 100644 --- a/DPGAnalysis/MuonTools/python/nano_mu_digi_cff.py +++ b/DPGAnalysis/MuonTools/python/nano_mu_digi_cff.py @@ -11,20 +11,20 @@ dtDigiFlatTableProducer.variables = cms.PSet( time = Var("time()", float, doc = "digi time"), - wire = Var("wire()", "int8", doc="wire - [1:X] range" + wire = Var("wire()", "int16", doc="wire - [1:X] range" "
(X varies for different chambers SLs and layers)") ) dtDigiFlatTableProducer.detIdVariables = cms.PSet( - wheel = DetIdVar("wheel()", "int8", doc = "wheel - [-2:2] range"), - sector = DetIdVar("sector()", "int8", doc = "sector - [1:14] range" + wheel = DetIdVar("wheel()", "int16", doc = "wheel - [-2:2] range"), + sector = DetIdVar("sector()", "int16", doc = "sector - [1:14] range" "
sector 13 used for the second MB4 of sector 4" "
sector 14 used for the second MB4 of sector 10"), - station = DetIdVar("station()", "int8", doc = "station - [1:4] range"), - superLayer = DetIdVar("superLayer()", "int8", doc = "superlayer - [1:3] range" + station = DetIdVar("station()", "int16", doc = "station - [1:4] range"), + superLayer = DetIdVar("superLayer()", "int16", doc = "superlayer - [1:3] range" "
SL 1 and 3 are phi SLs" "
SL 2 is theta SL"), - layer = DetIdVar("layer()", "int8", doc = "layer - [1:4] range") + layer = DetIdVar("layer()", "int16", doc = "layer - [1:4] range") ) @@ -40,18 +40,18 @@ ) rpcDigiFlatTableProducer.detIdVariables = cms.PSet( - region = DetIdVar("region()", "int8", doc = "0: barrel, +/-1: endcap"), - ring = DetIdVar("ring()", "int8", doc = "ring id:" + region = DetIdVar("region()", "int16", doc = "0: barrel, +/-1: endcap"), + ring = DetIdVar("ring()", "int16", doc = "ring id:" "
wheel number in barrel - [-2:+2] range" "
ring number in endcap - [1:3] range"), - station = DetIdVar("station()", "int8", doc = "chambers at same R in barrel, chambers at same Z ion endcap"), - layer = DetIdVar("layer()", "int8", doc = "layer id:" + station = DetIdVar("station()", "int16", doc = "chambers at same R in barrel, chambers at same Z ion endcap"), + layer = DetIdVar("layer()", "int16", doc = "layer id:" "
barrel stations 1 and 2, have two layers of chambers " "(layer 1 is the inner chamber and layer 2 is the outer chamber)"), - sector = DetIdVar("sector()", "int8", doc = "group of chambers at same phi"), - subsector = DetIdVar("subsector()", "int8", doc = "Some sectors are divided along the phi direction in subsectors " + sector = DetIdVar("sector()", "int16", doc = "group of chambers at same phi"), + subsector = DetIdVar("subsector()", "int16", doc = "Some sectors are divided along the phi direction in subsectors " "(from 1 to 4 in Barrel, from 1 to 6 in Endcap)"), - roll = DetIdVar("roll()", "int8", doc = "roll id (also known as eta partition):" + roll = DetIdVar("roll()", "int16", doc = "roll id (also known as eta partition):" "
each chamber is divided along the strip direction"), rawId = DetIdVar("rawId()", "uint", doc = "unique detector unit ID") ) @@ -63,19 +63,19 @@ gemDigiFlatTableProducer.doc = "GEM digi information" gemDigiFlatTableProducer.variables = cms.PSet( - strip = Var("strip()", "int8", doc = "index of the readout strip associated to the digi"), - bx = Var("bx()", "int8", doc="bunch crossing associated to the digi") + strip = Var("strip()", "int16", doc = "index of the readout strip associated to the digi"), + bx = Var("bx()", "int16", doc="bunch crossing associated to the digi") ) gemDigiFlatTableProducer.detIdVariables = cms.PSet( - station = DetIdVar("station()", "int8", doc = "GEM station
(always 1 for GE1/1)"), - region = DetIdVar("region()", "int8", doc = "GE11 region where the digi is detected" + station = DetIdVar("station()", "int16", doc = "GEM station
(always 1 for GE1/1)"), + region = DetIdVar("region()", "int16", doc = "GE11 region where the digi is detected" "
(int, positive endcap: +1, negative endcap: -1)"), - roll = DetIdVar("roll()", "int8", doc = "roll id (also known as eta partition)" + roll = DetIdVar("roll()", "int16", doc = "roll id (also known as eta partition)" "
(partitions numbered from 1 to 8)"), - chamber = DetIdVar("chamber()", "int8", doc = "GE11 superchamber where the hit is reconstructed" + chamber = DetIdVar("chamber()", "int16", doc = "GE11 superchamber where the hit is reconstructed" "
(chambers numbered from 0 to 35)"), - layer = DetIdVar("layer()", "int8", doc = "GE11 layer where the hit is reconstructed" + layer = DetIdVar("layer()", "int16", doc = "GE11 layer where the hit is reconstructed" "
(layer1: 1, layer2: 2)") ) @@ -98,11 +98,11 @@ ) gemohStatusFlatTableProducer.detIdVariables = cms.PSet( - station = DetIdVar("station()", "int8", doc = "GEM station
always 1 for GE1/1)"), - region = DetIdVar("region()", "int8", doc = "region with which the GEMOHStatus is associated" + station = DetIdVar("station()", "int16", doc = "GEM station
always 1 for GE1/1)"), + region = DetIdVar("region()", "int16", doc = "region with which the GEMOHStatus is associated" "
int, positive endcap: +1, negative endcap: -1"), - chamber = DetIdVar("chamber()", "int8", doc = "chamber with which the GEMOHStatus is associated"), - layer = DetIdVar("layer()", "int8", doc = "layer with which the GEMOHStatus is associated
either 1 or 2 for GE1/1 and GE2/1") + chamber = DetIdVar("chamber()", "int16", doc = "chamber with which the GEMOHStatus is associated"), + layer = DetIdVar("layer()", "int16", doc = "layer with which the GEMOHStatus is associated
either 1 or 2 for GE1/1 and GE2/1") ) @@ -113,17 +113,17 @@ cscWireDigiFlatTableProducer.doc = "CSC wire digi information" cscWireDigiFlatTableProducer.variables = cms.PSet( - timeBin = Var("getTimeBin()", "int8", doc = ""), - wireGroup = Var("getWireGroup()", "int8", doc=""), - wireGroupBX = Var("getWireGroupBX()", "int8", doc="") + timeBin = Var("getTimeBin()", "int16", doc = ""), + wireGroup = Var("getWireGroup()", "int16", doc=""), + wireGroupBX = Var("getWireGroupBX()", "int16", doc="") ) cscWireDigiFlatTableProducer.detIdVariables = cms.PSet( - endcap = DetIdVar("endcap()", "int8", doc = ""), - station = DetIdVar("station()", "int8", doc = ""), - ring = DetIdVar("ring()", "int8", doc = ""), - chamber = DetIdVar("chamber()", "int8", doc = ""), - layer = DetIdVar("layer()", "int8", doc = "") + endcap = DetIdVar("endcap()", "int16", doc = ""), + station = DetIdVar("station()", "int16", doc = ""), + ring = DetIdVar("ring()", "int16", doc = ""), + chamber = DetIdVar("chamber()", "int16", doc = ""), + layer = DetIdVar("layer()", "int16", doc = "") ) from DPGAnalysis.MuonTools.cscAlctDigiFlatTableProducer_cfi import cscAlctDigiFlatTableProducer @@ -133,16 +133,16 @@ cscAlctDigiFlatTableProducer.doc = "CSC ALCT digi information" cscAlctDigiFlatTableProducer.variables = cms.PSet( - keyWireGroup = Var("getKeyWG()", "int8", doc = ""), - bx = Var("getBX()", "int8", doc="") + keyWireGroup = Var("getKeyWG()", "int16", doc = ""), + bx = Var("getBX()", "int16", doc="") ) cscAlctDigiFlatTableProducer.detIdVariables = cms.PSet( - endcap = DetIdVar("endcap()", "int8", doc = ""), - station = DetIdVar("station()", "int8", doc = ""), - ring = DetIdVar("ring()", "int8", doc = ""), - chamber = DetIdVar("chamber()", "int8", doc = ""), - layer = DetIdVar("layer()", "int8", doc = "") + endcap = DetIdVar("endcap()", "int16", doc = ""), + station = DetIdVar("station()", "int16", doc = ""), + ring = DetIdVar("ring()", "int16", doc = ""), + chamber = DetIdVar("chamber()", "int16", doc = ""), + layer = DetIdVar("layer()", "int16", doc = "") ) muDigiProducers = cms.Sequence(dtDigiFlatTableProducer diff --git a/DPGAnalysis/MuonTools/python/nano_mu_local_reco_cff.py b/DPGAnalysis/MuonTools/python/nano_mu_local_reco_cff.py index 40fd37ccfa739..5046674c7c9a7 100644 --- a/DPGAnalysis/MuonTools/python/nano_mu_local_reco_cff.py +++ b/DPGAnalysis/MuonTools/python/nano_mu_local_reco_cff.py @@ -20,21 +20,21 @@ seg4D_dirLoc_z = Var("localDirection().z()", float, doc = "direction z in local coordinates"), seg2D_phi_t0 = Var(f"? hasPhi() ? phiSegment().t0() : {defaults.FLOAT}", float, doc = "t0 from segments with phi view - ns"), - seg2D_phi_nHits = Var(f"? hasPhi() ? phiSegment().specificRecHits().size() : 0", "int8", doc = "# hits in phi view - [0:8] range"), + seg2D_phi_nHits = Var(f"? hasPhi() ? phiSegment().specificRecHits().size() : 0", "int16", doc = "# hits in phi view - [0:8] range"), seg2D_phi_vDrift = Var(f"? hasPhi() ? phiSegment().vDrift() : {defaults.FLOAT_POS}", float, doc = "v_drift from segments with phi view"), seg2D_phi_normChi2 = Var(f"? hasPhi() ? (phiSegment().chi2() / phiSegment().degreesOfFreedom()) : {defaults.FLOAT_POS}", float, doc = "chi2/n.d.o.f. from segments with phi view"), seg2D_z_t0 = Var(f"? hasZed() ? zSegment().t0() : {defaults.FLOAT}", float, doc = "t0 from segments with z view - ns"), - seg2D_z_nHits = Var(f"? hasZed() ? zSegment().specificRecHits().size() : 0", "int8", doc = "# hits in z view - [0:4] range"), + seg2D_z_nHits = Var(f"? hasZed() ? zSegment().specificRecHits().size() : 0", "int16", doc = "# hits in z view - [0:4] range"), seg2D_z_normChi2 = Var(f"? hasZed() ? (zSegment().chi2() / zSegment().degreesOfFreedom()) : {defaults.FLOAT_POS}", float, doc = "chi2/n.d.o.f. from segments with z view"), ) dtSegmentFlatTableProducer.detIdVariables = cms.PSet( - wheel = DetIdVar("wheel()", "int8", doc = "wheel - [-2:2] range"), - sector = DetIdVar("sector()", "int8", doc = "sector - [1:14] range" + wheel = DetIdVar("wheel()", "int16", doc = "wheel - [-2:2] range"), + sector = DetIdVar("sector()", "int16", doc = "sector - [1:14] range" "
sector 13 used for the second MB4 of sector 4" "
sector 14 used for the second MB4 of sector 10"), - station = DetIdVar("station()", "int8", doc = "station - [1:4] range") + station = DetIdVar("station()", "int16", doc = "station - [1:4] range") ) dtSegmentFlatTableProducer.globalPosVariables = cms.PSet( @@ -58,26 +58,26 @@ rpcRecHitFlatTableProducer.variables = cms.PSet( bx = Var("BunchX()", int, doc="bunch crossing number"), time = Var("time()", float, doc = "time information in ns"), - firstClusterStrip = Var("firstClusterStrip()", "int8", doc = "lowest-numbered strip in the cluster"), - clusterSize = Var("clusterSize()", "int8", doc = "number of strips in the cluster"), + firstClusterStrip = Var("firstClusterStrip()", "int16", doc = "lowest-numbered strip in the cluster"), + clusterSize = Var("clusterSize()", "int16", doc = "number of strips in the cluster"), coordX = Var("localPosition().x()", float, doc = "position x in local coordinates - cm"), coordY = Var("localPosition().y()", float, doc = "position y in local coordinates - cm"), coordZ = Var("localPosition().z()", float, doc = "position z in local coordinates - cm"), ) rpcRecHitFlatTableProducer.detIdVariables = cms.PSet( - region = DetIdVar("region()", "int8", doc = "0: barrel, +-1: endcap"), - ring = DetIdVar("ring()", "int8", doc = "ring id:" + region = DetIdVar("region()", "int16", doc = "0: barrel, +-1: endcap"), + ring = DetIdVar("ring()", "int16", doc = "ring id:" "
wheel number in barrel (from -2 to +2)" "
ring number in endcap (from 1 to 3)"), - station = DetIdVar("station()", "int8", doc = "chambers at same R in barrel, chambers at same Z ion endcap"), - layer = DetIdVar("layer()", "int8", doc = "layer id:" + station = DetIdVar("station()", "int16", doc = "chambers at same R in barrel, chambers at same Z ion endcap"), + layer = DetIdVar("layer()", "int16", doc = "layer id:" "
in station 1 and 2 for barrel, we have two layers of chambers:" "
layer 1 is the inner chamber and layer 2 is the outer chamber"), - sector = DetIdVar("sector()", "int8", doc = "group of chambers at same phi"), - subsector = DetIdVar("subsector()", "int8", doc = "Some sectors are divided along the phi direction in subsectors " + sector = DetIdVar("sector()", "int16", doc = "group of chambers at same phi"), + subsector = DetIdVar("subsector()", "int16", doc = "Some sectors are divided along the phi direction in subsectors " "(from 1 to 4 in Barrel, from 1 to 6 in Endcap)"), - roll = DetIdVar("roll()", "int8", doc = "roll id (also known as eta partition):" + roll = DetIdVar("roll()", "int16", doc = "roll id (also known as eta partition):" "
each chamber is divided along the strip direction"), rawId = DetIdVar("rawId()", "uint", doc = "unique detector unit ID") ) @@ -91,18 +91,18 @@ ) dtrpcPointFlatTableProducer.detIdVariables = cms.PSet( - region = DetIdVar("region()", "int8", doc = "0: barrel, +-1: endcap"), - ring = DetIdVar("ring()", "int8", doc = "ring id:" + region = DetIdVar("region()", "int16", doc = "0: barrel, +-1: endcap"), + ring = DetIdVar("ring()", "int16", doc = "ring id:" "
wheel number in barrel (from -2 to +2)" "
ring number in endcap (from 1 to 3)"), - station = DetIdVar("station()", "int8", doc = "chambers at same R in barrel, chambers at same Z ion endcap"), - layer = DetIdVar("layer()", "int8", doc = "layer id:" + station = DetIdVar("station()", "int16", doc = "chambers at same R in barrel, chambers at same Z ion endcap"), + layer = DetIdVar("layer()", "int16", doc = "layer id:" "
in station 1 and 2 for barrel, we have two layers of chambers:" "
layer 1 is the inner chamber and layer 2 is the outer chamber"), - sector = DetIdVar("sector()", "int8", doc = "group of chambers at same phi"), - subsector = DetIdVar("subsector()", "int8", doc = "Some sectors are divided along the phi direction in subsectors " + sector = DetIdVar("sector()", "int16", doc = "group of chambers at same phi"), + subsector = DetIdVar("subsector()", "int16", doc = "Some sectors are divided along the phi direction in subsectors " "(from 1 to 4 in Barrel, from 1 to 6 in Endcap)"), - roll = DetIdVar("roll()", "int8", doc = "roll id (also known as eta partition):" + roll = DetIdVar("roll()", "int16", doc = "roll id (also known as eta partition):" "
each chamber is divided along the strip direction"), rawId = DetIdVar("rawId()", "uint", doc = "unique detector unit ID") ) @@ -117,18 +117,18 @@ ) cscrpcPointFlatTableProducer.detIdVariables = cms.PSet( - region = DetIdVar("region()", "int8", doc = "0: barrel, +-1: endcap"), - ring = DetIdVar("ring()", "int8", doc = "ring id:" + region = DetIdVar("region()", "int16", doc = "0: barrel, +-1: endcap"), + ring = DetIdVar("ring()", "int16", doc = "ring id:" "
wheel number in barrel (from -2 to +2)" "
ring number in endcap (from 1 to 3)"), - station = DetIdVar("station()", "int8", doc = "chambers at same R in barrel, chambers at same Z ion endcap"), - layer = DetIdVar("layer()", "int8", doc = "layer id:" + station = DetIdVar("station()", "int16", doc = "chambers at same R in barrel, chambers at same Z ion endcap"), + layer = DetIdVar("layer()", "int16", doc = "layer id:" "
in station 1 and 2 for barrel, we have two layers of chambers:" "
layer 1 is the inner chamber and layer 2 is the outer chamber"), - sector = DetIdVar("sector()", "int8", doc = "group of chambers at same phi"), - subsector = DetIdVar("subsector()", "int8", doc = "Some sectors are divided along the phi direction in subsectors " + sector = DetIdVar("sector()", "int16", doc = "group of chambers at same phi"), + subsector = DetIdVar("subsector()", "int16", doc = "Some sectors are divided along the phi direction in subsectors " "(from 1 to 4 in Barrel, from 1 to 6 in Endcap)"), - roll = DetIdVar("roll()", "int8", doc = "roll id (also known as eta partition):" + roll = DetIdVar("roll()", "int16", doc = "roll id (also known as eta partition):" "
each chamber is divided along the strip direction"), rawId = DetIdVar("rawId()", "uint", doc = "unique detector unit ID") ) @@ -144,18 +144,18 @@ ) dtrpcPointFlatTableProducer.detIdVariables = cms.PSet( - region = DetIdVar("region()", "int8", doc = "0: barrel, +-1: endcap"), - ring = DetIdVar("ring()", "int8", doc = "ring id:" + region = DetIdVar("region()", "int16", doc = "0: barrel, +-1: endcap"), + ring = DetIdVar("ring()", "int16", doc = "ring id:" "
wheel number in barrel (from -2 to +2)" "
ring number in endcap (from 1 to 3)"), - station = DetIdVar("station()", "int8", doc = "chambers at same R in barrel, chambers at same Z ion endcap"), - layer = DetIdVar("layer()", "int8", doc = "layer id:" + station = DetIdVar("station()", "int16", doc = "chambers at same R in barrel, chambers at same Z ion endcap"), + layer = DetIdVar("layer()", "int16", doc = "layer id:" "
in station 1 and 2 for barrel, we have two layers of chambers:" "
layer 1 is the inner chamber and layer 2 is the outer chamber"), - sector = DetIdVar("sector()", "int8", doc = "group of chambers at same phi"), - subsector = DetIdVar("subsector()", "int8", doc = "Some sectors are divided along the phi direction in subsectors " + sector = DetIdVar("sector()", "int16", doc = "group of chambers at same phi"), + subsector = DetIdVar("subsector()", "int16", doc = "Some sectors are divided along the phi direction in subsectors " "(from 1 to 4 in Barrel, from 1 to 6 in Endcap)"), - roll = DetIdVar("roll()", "int8", doc = "roll id (also known as eta partition):" + roll = DetIdVar("roll()", "int16", doc = "roll id (also known as eta partition):" "
each chamber is divided along the strip direction"), rawId = DetIdVar("rawId()", "uint", doc = "unique detector unit ID") ) @@ -169,21 +169,21 @@ gemRecHitFlatTableProducer.variables = cms.PSet( bx = Var("BunchX()", int, doc="bunch crossing number"), - clusterSize = Var("clusterSize()", "int8", doc = "number of strips in the cluster"), loc_x = Var("localPosition().x()", float, doc = "hit position x in local coordinates - cm"), - firstClusterStrip = Var("firstClusterStrip()", "int8", doc = "lowest-numbered strip in the cluster"), + clusterSize = Var("clusterSize()", "int16", doc = "number of strips in the cluster"), loc_x = Var("localPosition().x()", float, doc = "hit position x in local coordinates - cm"), + firstClusterStrip = Var("firstClusterStrip()", "int16", doc = "lowest-numbered strip in the cluster"), loc_phi = Var("localPosition().phi().value()", float, doc = "hit position phi in local coordinates - rad"), loc_y = Var("localPosition().y()", float, doc = "hit position y in local coordinates - cm"), loc_z = Var("localPosition().z()", float, doc = "hit position z in local coordinates - cm"), ) gemRecHitFlatTableProducer.detIdVariables = cms.PSet( - roll = DetIdVar("roll()", "int8", doc = "roll id, also known as eta partition:" + roll = DetIdVar("roll()", "int16", doc = "roll id, also known as eta partition:" "
(partitions numbered from 1 to 8)"), - region = DetIdVar("region()", "int8", doc = "GE11 region where the hit is reconstructed" + region = DetIdVar("region()", "int16", doc = "GE11 region where the hit is reconstructed" "
(int, positive endcap: +1, negative endcap: -1)"), - chamber = DetIdVar("chamber()", "int8", doc = "GE11 superchamber where the hit is reconstructed" + chamber = DetIdVar("chamber()", "int16", doc = "GE11 superchamber where the hit is reconstructed" "
(chambers numbered from 0 to 35)"), - layer = DetIdVar("layer()", "int8", doc = "GE11 layer where the hit is reconstructed" + layer = DetIdVar("layer()", "int16", doc = "GE11 layer where the hit is reconstructed" "
(layer1: 1, layer2: 2)") ) @@ -213,11 +213,11 @@ ) gemSegmentFlatTableProducer.detIdVariables = cms.PSet( - region = DetIdVar("region()", "int8", doc = "GE11 region where the hit is reconstructed" + region = DetIdVar("region()", "int16", doc = "GE11 region where the hit is reconstructed" "
(int, positive endcap: +1, negative endcap: -1)"), - ring = DetIdVar("ring()", "int8", doc = ""), - station = DetIdVar("station()", "int8", doc = "GEM station
(always 1 for GE1/1)"), - chamber = DetIdVar("chamber()", "int8", doc = "GE11 superchamber where the hit is reconstructed" + ring = DetIdVar("ring()", "int16", doc = ""), + station = DetIdVar("station()", "int16", doc = "GEM station
(always 1 for GE1/1)"), + chamber = DetIdVar("chamber()", "int16", doc = "GE11 superchamber where the hit is reconstructed" "
(chambers numbered from 0 to 35)") ) diff --git a/DPGAnalysis/MuonTools/python/nano_mu_reco_cff.py b/DPGAnalysis/MuonTools/python/nano_mu_reco_cff.py index 1d4716f5099bf..d32ab9dcf79fc 100644 --- a/DPGAnalysis/MuonTools/python/nano_mu_reco_cff.py +++ b/DPGAnalysis/MuonTools/python/nano_mu_reco_cff.py @@ -30,18 +30,18 @@ trk_dz = Var(f"?!innerTrack().isNull()? dB('PVDZ') : {defaults.FLOAT}", float, doc="dz (with sign) wrt first PV - cm", precision=10), trk_dxy = Var(f"?!innerTrack().isNull()? dB('PV2D') : {defaults.FLOAT}", float, doc="dxy (with sign) wrt first PV - cm", precision=10), - trk_algo = Var(f"?!innerTrack().isNull()? innerTrack().algo() : {defaults.INT_POS}", "int8", doc="iterative tracking algorithm used to build the inner track"), - trk_origAlgo = Var(f"?!innerTrack().isNull()? innerTrack().originalAlgo() : {defaults.INT_POS}", "int8", doc="original (pre muon iterations) iterative tracking algorithm used to build the inner track"), + trk_algo = Var(f"?!innerTrack().isNull()? innerTrack().algo() : {defaults.INT_POS}", "int16", doc="iterative tracking algorithm used to build the inner track"), + trk_origAlgo = Var(f"?!innerTrack().isNull()? innerTrack().originalAlgo() : {defaults.INT_POS}", "int16", doc="original (pre muon iterations) iterative tracking algorithm used to build the inner track"), - trk_numberOfValidPixelHits = Var(f"?!innerTrack().isNull()? innerTrack().hitPattern().numberOfValidPixelHits() : {defaults.INT_POS}", "int8", doc="number of valid pixel hits"), - trk_numberOfValidTrackerLayers = Var(f"?!innerTrack().isNull()? innerTrack().hitPattern().trackerLayersWithMeasurement() : {defaults.INT_POS}", "int8", doc="number of valid tracker layers"), - trk_validFraction = Var(f"?!innerTrack().isNull()? innerTrack().validFraction() : {defaults.FLOAT_POS}", "int8", doc="fraction of tracker layer with muon hits"), + trk_numberOfValidPixelHits = Var(f"?!innerTrack().isNull()? innerTrack().hitPattern().numberOfValidPixelHits() : {defaults.INT_POS}", "int16", doc="number of valid pixel hits"), + trk_numberOfValidTrackerLayers = Var(f"?!innerTrack().isNull()? innerTrack().hitPattern().trackerLayersWithMeasurement() : {defaults.INT_POS}", "int16", doc="number of valid tracker layers"), + trk_validFraction = Var(f"?!innerTrack().isNull()? innerTrack().validFraction() : {defaults.FLOAT_POS}", "int16", doc="fraction of tracker layer with muon hits"), trkMu_stationMask = Var("stationMask()", "uint8", doc="bit map of stations with tracks within given distance (in cm) of chamber edges"), - trkMu_numberOfMatchedStations = Var("numberOfMatchedStations()", "int8", doc="number of matched DT/CSC stations"), - rpcMu_numberOfMatchedRPCLayers = Var("numberOfMatchedRPCLayers()", "int8", doc="number of matched RPC layers"), + trkMu_numberOfMatchedStations = Var("numberOfMatchedStations()", "int16", doc="number of matched DT/CSC stations"), + rpcMu_numberOfMatchedRPCLayers = Var("numberOfMatchedRPCLayers()", "int16", doc="number of matched RPC layers"), - staMu_numberOfValidMuonHits = Var(f"?isStandAloneMuon()? outerTrack().hitPattern().numberOfValidMuonHits() : {defaults.INT_POS}", "int8", doc="Number of valid muon hits"), + staMu_numberOfValidMuonHits = Var(f"?isStandAloneMuon()? outerTrack().hitPattern().numberOfValidMuonHits() : {defaults.INT_POS}", "int16", doc="Number of valid muon hits"), staMu_normChi2 = Var(f"?isStandAloneMuon()? outerTrack().chi2()/outerTrack().ndof() : {defaults.FLOAT_POS}", float, doc="chi2/ndof (standalone track)", precision=10), glbMu_normChi2 = Var(f"?isGlobalMuon()? globalTrack().chi2()/globalTrack().ndof() : {defaults.FLOAT_POS}", float, doc="chi2/ndof (global track)", precision=10) diff --git a/DataFormats/NanoAOD/interface/FlatTable.h b/DataFormats/NanoAOD/interface/FlatTable.h index 1b2f791c6f9e2..e6b574656e742 100644 --- a/DataFormats/NanoAOD/interface/FlatTable.h +++ b/DataFormats/NanoAOD/interface/FlatTable.h @@ -37,8 +37,8 @@ namespace nanoaod { class FlatTable { public: + //Int8, //removed due to mis-interpretation in ROOT/pyroot enum class ColumnType { - Int8, UInt8, Int16, UInt16, @@ -140,9 +140,7 @@ namespace nanoaod { struct dependent_false : std::false_type {}; template static ColumnType defaultColumnType() { - if constexpr (std::is_same()) - return ColumnType::Int8; - else if constexpr (std::is_same()) + if constexpr (std::is_same()) return ColumnType::UInt8; else if constexpr (std::is_same()) return ColumnType::Int16; @@ -194,9 +192,7 @@ namespace nanoaod { template static auto &bigVectorImpl(This &table) { // helper function to avoid code duplication, for the two accessor functions that differ only in const-ness - if constexpr (std::is_same()) - return table.int8s_; - else if constexpr (std::is_same()) + if constexpr (std::is_same()) return table.uint8s_; else if constexpr (std::is_same()) return table.int16s_; @@ -220,7 +216,6 @@ namespace nanoaod { std::string name_, doc_; bool singleton_, extension_; std::vector columns_; - std::vector int8s_; std::vector uint8s_; std::vector int16s_; std::vector uint16s_; diff --git a/DataFormats/NanoAOD/src/FlatTable.cc b/DataFormats/NanoAOD/src/FlatTable.cc index 1565040b86b28..38f43fafe2927 100644 --- a/DataFormats/NanoAOD/src/FlatTable.cc +++ b/DataFormats/NanoAOD/src/FlatTable.cc @@ -13,9 +13,6 @@ void nanoaod::FlatTable::addExtension(const nanoaod::FlatTable& other) { throw cms::Exception("LogicError", "Mismatch in adding extension"); for (unsigned int i = 0, n = other.nColumns(); i < n; ++i) { switch (other.columnType(i)) { - case ColumnType::Int8: - addColumn(other.columnName(i), other.columnData(i), other.columnDoc(i)); - break; case ColumnType::UInt8: addColumn(other.columnName(i), other.columnData(i), other.columnDoc(i)); break; @@ -50,8 +47,6 @@ double nanoaod::FlatTable::getAnyValue(unsigned int row, unsigned int column) co if (column >= nColumns()) throw cms::Exception("LogicError", "Invalid column"); switch (columnType(column)) { - case ColumnType::Int8: - return *(beginData(column) + row); case ColumnType::UInt8: return *(beginData(column) + row); case ColumnType::Int16: diff --git a/DataFormats/NanoAOD/src/classes_def.xml b/DataFormats/NanoAOD/src/classes_def.xml index 582d353813d4d..4622b201ae460 100644 --- a/DataFormats/NanoAOD/src/classes_def.xml +++ b/DataFormats/NanoAOD/src/classes_def.xml @@ -3,11 +3,12 @@ - + + - - - + + + diff --git a/PhysicsTools/NanoAOD/interface/SimpleFlatTableProducer.h b/PhysicsTools/NanoAOD/interface/SimpleFlatTableProducer.h index 85d63e7ca8948..4644c3ccf78de 100644 --- a/PhysicsTools/NanoAOD/interface/SimpleFlatTableProducer.h +++ b/PhysicsTools/NanoAOD/interface/SimpleFlatTableProducer.h @@ -135,8 +135,6 @@ class SimpleFlatTableProducerBase : public edm::stream::EDProducer<> { vars_.push_back(std::make_unique(vname, varPSet)); else if (type == "double") vars_.push_back(std::make_unique(vname, varPSet)); - else if (type == "int8") - vars_.push_back(std::make_unique(vname, varPSet)); else if (type == "uint8") vars_.push_back(std::make_unique(vname, varPSet)); else if (type == "int16") @@ -170,7 +168,7 @@ class SimpleFlatTableProducerBase : public edm::stream::EDProducer<> { variable.ifValue( edm::ParameterDescription( "type", "int", true, edm::Comment("the c++ type of the branch in the flat table")), - edm::allowedValues("int", "uint", "float", "double", "int8", "uint8", "int16", "uint16", "bool")); + edm::allowedValues("int", "uint", "float", "double", "uint8", "int16", "uint16", "bool")); variable.addOptionalNode( edm::ParameterDescription( "precision", true, edm::Comment("the precision with which to store the value in the flat table")) xor @@ -211,7 +209,6 @@ class SimpleFlatTableProducerBase : public edm::stream::EDProducer<> { typedef FuncVariable, uint32_t> UIntVar; typedef FuncVariable, float> FloatVar; typedef FuncVariable, double> DoubleVar; - typedef FuncVariable, int8_t> Int8Var; typedef FuncVariable, uint8_t> UInt8Var; typedef FuncVariable, int16_t> Int16Var; typedef FuncVariable, uint16_t> UInt16Var; @@ -245,9 +242,6 @@ class SimpleFlatTableProducer : public SimpleFlatTableProducerBase(vname, varPSet, this->consumesCollector(), this->skipNonExistingSrc_)); - else if (type == "int8") - extvars_.push_back( - std::make_unique(vname, varPSet, this->consumesCollector(), this->skipNonExistingSrc_)); else if (type == "uint8") extvars_.push_back( std::make_unique(vname, varPSet, this->consumesCollector(), this->skipNonExistingSrc_)); @@ -285,7 +279,7 @@ class SimpleFlatTableProducer : public SimpleFlatTableProducerBase( "type", "int", true, edm::Comment("the c++ type of the branch in the flat table")), - edm::allowedValues("int", "uint", "float", "double", "int8", "uint8", "int16", "uint16", "bool")); + edm::allowedValues("int", "uint", "float", "double", "uint8", "int16", "uint16", "bool")); extvariable.addOptionalNode( edm::ParameterDescription( "precision", true, edm::Comment("the precision with which to store the value in the flat table")) xor @@ -343,7 +337,6 @@ class SimpleFlatTableProducer : public SimpleFlatTableProducerBase FloatExtVar; typedef ValueMapVariable DoubleExtVar; typedef ValueMapVariable BoolExtVar; - typedef ValueMapVariable Int8ExtVar; typedef ValueMapVariable UInt8ExtVar; typedef ValueMapVariable Int16ExtVar; typedef ValueMapVariable UInt16ExtVar; diff --git a/PhysicsTools/NanoAOD/plugins/NanoAODDQM.cc b/PhysicsTools/NanoAOD/plugins/NanoAODDQM.cc index 796325e9e3499..17e5fde624ea2 100644 --- a/PhysicsTools/NanoAOD/plugins/NanoAODDQM.cc +++ b/PhysicsTools/NanoAOD/plugins/NanoAODDQM.cc @@ -97,9 +97,6 @@ class NanoAODDQM : public DQMEDAnalyzer { if (icol == -1) return; // columns may be missing (e.g. mc-only) switch (table.columnType(icol)) { - case FlatTable::ColumnType::Int8: - vfill(table, icol, rowsel); - break; case FlatTable::ColumnType::UInt8: vfill(table, icol, rowsel); break; diff --git a/PhysicsTools/NanoAOD/plugins/TableOutputBranches.cc b/PhysicsTools/NanoAOD/plugins/TableOutputBranches.cc index 784f89ae8b9ac..591c3b97795b8 100644 --- a/PhysicsTools/NanoAOD/plugins/TableOutputBranches.cc +++ b/PhysicsTools/NanoAOD/plugins/TableOutputBranches.cc @@ -14,9 +14,6 @@ void TableOutputBranches::defineBranchesFromFirstEvent(const nanoaod::FlatTable for (size_t i = 0; i < tab.nColumns(); i++) { const std::string &var = tab.columnName(i); switch (tab.columnType(i)) { - case nanoaod::FlatTable::ColumnType::Int8: - m_int8Branches.emplace_back(var, tab.columnDoc(i), "B"); - break; case nanoaod::FlatTable::ColumnType::UInt8: m_uint8Branches.emplace_back(var, tab.columnDoc(i), "b"); break; @@ -65,8 +62,7 @@ void TableOutputBranches::branch(TTree &tree) { } } std::string varsize = m_singleton ? "" : "[n" + m_baseName + "]"; - for (std::vector *branches : {&m_int8Branches, - &m_uint8Branches, + for (std::vector *branches : {&m_uint8Branches, &m_int16Branches, &m_uint16Branches, &m_int32Branches, @@ -115,8 +111,6 @@ void TableOutputBranches::fill(const edm::OccurrenceForOutput &iWhatever, TTree "Mismatch in number of entries between extension and main table for " + tab.name()); } } - for (auto &pair : m_int8Branches) - fillColumn(pair, tab); for (auto &pair : m_uint8Branches) fillColumn(pair, tab); for (auto &pair : m_int16Branches) diff --git a/PhysicsTools/NanoAOD/plugins/TableOutputBranches.h b/PhysicsTools/NanoAOD/plugins/TableOutputBranches.h index f610559428781..29e71cd12856e 100644 --- a/PhysicsTools/NanoAOD/plugins/TableOutputBranches.h +++ b/PhysicsTools/NanoAOD/plugins/TableOutputBranches.h @@ -42,7 +42,6 @@ class TableOutputBranches { : name(aname), title(atitle), rootTypeCode(rootType), branch(branchptr) {} }; TBranch *m_counterBranch = nullptr; - std::vector m_int8Branches; std::vector m_uint8Branches; std::vector m_int16Branches; std::vector m_uint16Branches; diff --git a/PhysicsTools/NanoAOD/python/electrons_cff.py b/PhysicsTools/NanoAOD/python/electrons_cff.py index 9168c9d3643a3..2cd77055cae25 100644 --- a/PhysicsTools/NanoAOD/python/electrons_cff.py +++ b/PhysicsTools/NanoAOD/python/electrons_cff.py @@ -350,8 +350,8 @@ def _get_bitmapVIDForEle_docstring(modules,WorkingPoints): lostHits = Var("gsfTrack.hitPattern.numberOfLostHits('MISSING_INNER_HITS')","uint8",doc="number of missing inner hits"), isPFcand = Var("pfCandidateRef().isNonnull()",bool,doc="electron is PF candidate"), seedGain = Var("userInt('seedGain')","uint8",doc="Gain of the seed crystal"), - seediEtaOriX = Var("superCluster().seedCrysIEtaOrIx","int8",doc="iEta or iX of seed crystal. iEta is barrel-only, iX is endcap-only. iEta runs from -85 to +85, with no crystal at iEta=0. iX runs from 1 to 100."), - seediPhiOriY = Var("superCluster().seedCrysIPhiOrIy",int,doc="iPhi or iY of seed crystal. iPhi is barrel-only, iY is endcap-only. iPhi runs from 1 to 360. iY runs from 1 to 100."), + seediEtaOriX = Var("superCluster().seedCrysIEtaOrIx","int16",doc="iEta or iX of seed crystal. iEta is barrel-only, iX is endcap-only. iEta runs from -85 to +85, with no crystal at iEta=0. iX runs from 1 to 100."), + seediPhiOriY = Var("superCluster().seedCrysIPhiOrIy","int16",doc="iPhi or iY of seed crystal. iPhi is barrel-only, iY is endcap-only. iPhi runs from 1 to 360. iY runs from 1 to 100."), jetNDauCharged = Var("?userCand('jetForLepJetVar').isNonnull()?userFloat('jetNDauChargedMVASel'):0", "uint8", doc="number of charged daughters of the closest jet"), ), externalVariables = cms.PSet( diff --git a/PhysicsTools/NanoAOD/python/globals_cff.py b/PhysicsTools/NanoAOD/python/globals_cff.py index 5c7ad360f7538..20e63336efa9b 100644 --- a/PhysicsTools/NanoAOD/python/globals_cff.py +++ b/PhysicsTools/NanoAOD/python/globals_cff.py @@ -11,7 +11,7 @@ name = cms.string("BeamSpot"), doc = cms.string("offlineBeamSpot, the offline reconstructed beamspot"), variables = cms.PSet( - type = Var("type()","int8",doc="BeamSpot type (Unknown = -1, Fake = 0, LHC = 1, Tracker = 2)"), + type = Var("type()","int16",doc="BeamSpot type (Unknown = -1, Fake = 0, LHC = 1, Tracker = 2)"), z = Var("position().z()",float,doc="BeamSpot center, z coordinate (cm)",precision=-1), zError = Var("z0Error()",float,doc="Error on BeamSpot center, z coordinate (cm)",precision=-1), sigmaZ = Var("sigmaZ()",float,doc="Width of BeamSpot in z (cm)",precision=-1), diff --git a/PhysicsTools/NanoAOD/python/photons_cff.py b/PhysicsTools/NanoAOD/python/photons_cff.py index 24273707d5cf6..c99619d353f2b 100644 --- a/PhysicsTools/NanoAOD/python/photons_cff.py +++ b/PhysicsTools/NanoAOD/python/photons_cff.py @@ -232,8 +232,8 @@ def make_bitmapVID_docstring(id_modules_working_points_pset): isScEtaEB = Var("abs(superCluster().eta()) < 1.4442",bool,doc="is supercluster eta within barrel acceptance"), isScEtaEE = Var("abs(superCluster().eta()) > 1.566 && abs(superCluster().eta()) < 2.5",bool,doc="is supercluster eta within endcap acceptance"), seedGain = Var("userInt('seedGain')","uint8",doc="Gain of the seed crystal"), - seediEtaOriX = Var("superCluster().seedCrysIEtaOrIx","int8",doc="iEta or iX of seed crystal. iEta is barrel-only, iX is endcap-only. iEta runs from -85 to +85, with no crystal at iEta=0. iX runs from 1 to 100."), - seediPhiOriY = Var("superCluster().seedCrysIPhiOrIy",int,doc="iPhi or iY of seed crystal. iPhi is barrel-only, iY is endcap-only. iPhi runs from 1 to 360. iY runs from 1 to 100."), + seediEtaOriX = Var("superCluster().seedCrysIEtaOrIx","int16",doc="iEta or iX of seed crystal. iEta is barrel-only, iX is endcap-only. iEta runs from -85 to +85, with no crystal at iEta=0. iX runs from 1 to 100."), + seediPhiOriY = Var("superCluster().seedCrysIPhiOrIy","int16",doc="iPhi or iY of seed crystal. iPhi is barrel-only, iY is endcap-only. iPhi runs from 1 to 360. iY runs from 1 to 100."), # position of photon is best approximated by position of seed cluster, not the SC centroid x_calo = Var("superCluster().seed().position().x()",float,doc="photon supercluster position on calorimeter, x coordinate (cm)",precision=10), y_calo = Var("superCluster().seed().position().y()",float,doc="photon supercluster position on calorimeter, y coordinate (cm)",precision=10),