diff --git a/Configuration/PyReleaseValidation/python/relval_standard.py b/Configuration/PyReleaseValidation/python/relval_standard.py index 750bf14d59c92..5761360b5c565 100644 --- a/Configuration/PyReleaseValidation/python/relval_standard.py +++ b/Configuration/PyReleaseValidation/python/relval_standard.py @@ -437,7 +437,7 @@ workflows[138.1] = ['',['RunCosmics2021','RECOCOSDPROMPTRUN3','ALCACOSDPROMPTRUN3','HARVESTDCPROMPTRUN3']] workflows[138.2] = ['',['RunCosmics2021','RECOCOSDEXPRUN3','ALCACOSDEXPRUN3','HARVESTDCEXPRUN3']] ### 2021 Splash events -workflows[138.3] = ['',['RunMinimumBias2021Splash','RECODR3Splash','HARVESTDR3']] +workflows[138.3] = ['',['RunMinimumBias2021Splash','COPYPASTER3', 'RECODR3Splash','HARVESTDR3']] #### Test of lumi section boundary crossing with run2 2018D #### workflows[136.8861] = ['',['RunEGamma2018Dml1','HLTDR2_2018ml','RECODR2_2018reHLT_skimEGamma_Prompt_L1TEgDQM','HARVEST2018_L1TEgDQM_Prompt']] diff --git a/Configuration/PyReleaseValidation/python/relval_steps.py b/Configuration/PyReleaseValidation/python/relval_steps.py index 9bf9d39181406..673003c48eaa7 100644 --- a/Configuration/PyReleaseValidation/python/relval_steps.py +++ b/Configuration/PyReleaseValidation/python/relval_steps.py @@ -3125,6 +3125,7 @@ def gen2021HiMix(fragment,howMuch): '--conditions':'auto:run1_mc', '--output':'\'[{"t":"RAW","e":"ALL"}]\'', '--customise_commands':'"process.ALLRAWoutput.fastCloning=cms.untracked.bool(False)"'} +steps['COPYPASTER3'] = merge([{'--era' : 'Run3'}, steps['COPYPASTE']]) #miniaod stepMiniAODDefaults = { '-s' : 'PAT', diff --git a/DQM/Integration/python/clients/beampixel_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/beampixel_dqm_sourceclient-live_cfg.py index e5dab578f1b0e..826ac8cb8d5d0 100644 --- a/DQM/Integration/python/clients/beampixel_dqm_sourceclient-live_cfg.py +++ b/DQM/Integration/python/clients/beampixel_dqm_sourceclient-live_cfg.py @@ -107,7 +107,7 @@ #---------------------------- if (process.runType.getRunType() == process.runType.pp_run or process.runType.getRunType() == process.runType.pp_run_stage1 or process.runType.getRunType() == process.runType.cosmic_run or process.runType.getRunType() == process.runType.cosmic_run_stage1 or - process.runType.getRunType() == process.runType.hpu_run): + process.runType.getRunType() == process.runType.hpu_run or process.runType.getRunType() == process.runType.commissioning_run ): print("[beampixel_dqm_sourceclient-live_cfg]::running pp") diff --git a/DQMServices/Components/scripts/dqmiodumpmetadata.py b/DQMServices/Components/scripts/dqmiodumpmetadata.py index feffbc1115e20..c02d6577e030e 100755 --- a/DQMServices/Components/scripts/dqmiodumpmetadata.py +++ b/DQMServices/Components/scripts/dqmiodumpmetadata.py @@ -14,13 +14,13 @@ f = uproot.open(args.filename) things = f.keys() -if b'Indices;1' in things: - indices = f[b'Indices'] - runs = indices.array(b"Run") - lumis = indices.array(b"Lumi") - firstindex = indices.array(b"FirstIndex") - lastindex = indices.array(b"LastIndex") - types = indices.array(b"Type") +if 'Indices;1' in things: + indices = f['Indices'] + runs = indices['Run'].array() + lumis = indices['Lumi'].array() + firstindex = indices['FirstIndex'].array() + lastindex = indices['LastIndex'].array() + types = indices['Type'].array() counts = defaultdict(lambda: 0) for run, lumi, first, last, type in zip(runs, lumis, firstindex, lastindex, types): @@ -54,5 +54,3 @@ def showrow(): else: print("This does not look like DQMIO data.") - - diff --git a/DQMServices/Components/scripts/dqmiolistmes.py b/DQMServices/Components/scripts/dqmiolistmes.py index 9e462a0240708..c03f82db56613 100755 --- a/DQMServices/Components/scripts/dqmiolistmes.py +++ b/DQMServices/Components/scripts/dqmiolistmes.py @@ -19,13 +19,13 @@ f = uproot.open(args.filename) things = f.keys() -if b'Indices;1' in things: - indices = f[b'Indices'] - runs = indices.array(b"Run") - lumis = indices.array(b"Lumi") - firstindex = indices.array(b"FirstIndex") - lastindex = indices.array(b"LastIndex") - types = indices.array(b"Type") +if 'Indices;1' in things: + indices = f['Indices'] + runs = indices['Run'].array() + lumis = indices['Lumi'].array() + firstindex = indices['FirstIndex'].array() + lastindex = indices['LastIndex'].array() + types = indices['Type'].array() # If run is not provided, print all available runs in a given file. if args.r == None or args.r < 0: @@ -36,25 +36,24 @@ exit() treenames = [ # order matters! - b"Ints", - b"Floats", - b"Strings", - b"TH1Fs", - b"TH1Ss", - b"TH1Ds", - b"TH2Fs", - b"TH2Ss", - b"TH2Ds", - b"TH3Fs", - b"TProfiles", - b"TProfile2Ds" + "Ints", + "Floats", + "Strings", + "TH1Fs", + "TH1Ss", + "TH1Ds", + "TH2Fs", + "TH2Ss", + "TH2Ds", + "TH3Fs", + "TProfiles", + "TProfile2Ds" ] - trees = [f[name][b"FullName"].array() for name in treenames] + trees = [f[name]["FullName"].array() for name in treenames] for run, lumi, first, last, type in zip(runs, lumis, firstindex, lastindex, types): if run == args.r and lumi == args.l: for i in range(first, int(last + 1)): # In DQMIO both ranges are inclusive - print(trees[type][i].decode()) + print(trees[type][i]) else: print("This does not look like DQMIO data.") - diff --git a/DQMServices/Demo/test/runtests.sh b/DQMServices/Demo/test/runtests.sh index 7d018032a7d38..6c94d32c7b88c 100755 --- a/DQMServices/Demo/test/runtests.sh +++ b/DQMServices/Demo/test/runtests.sh @@ -72,7 +72,7 @@ dqmiodumpmetadata.py merged.root | grep -q '4 runs, 12 lumisections' rootlist () { python3 -c ' import uproot -for k in uproot.open("'"$1"'").allkeys(): print(k.decode())' +for k in uproot.open("'"$1"'").keys(): print(k)' } # we need to exclude MEs filled on run and lumi boundaries, since the split job *does* see a different number of begin/end run/lumi transitions. diff --git a/Geometry/HGCalCommonData/data/dd4hep/cms-test-ddhgcalcell-algorithm.xml b/Geometry/HGCalCommonData/data/dd4hep/cms-test-ddhgcalcell-algorithm.xml index 808bb8923e33d..fff106962517a 100644 --- a/Geometry/HGCalCommonData/data/dd4hep/cms-test-ddhgcalcell-algorithm.xml +++ b/Geometry/HGCalCommonData/data/dd4hep/cms-test-ddhgcalcell-algorithm.xml @@ -23,9 +23,9 @@ - - - + + + diff --git a/Geometry/HGCalCommonData/data/hgcalcell/vtest/hgcal.xml b/Geometry/HGCalCommonData/data/hgcalcell/vtest/hgcal.xml new file mode 100644 index 0000000000000..849d81e9e702e --- /dev/null +++ b/Geometry/HGCalCommonData/data/hgcalcell/vtest/hgcal.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + diff --git a/Geometry/HGCalCommonData/data/hgcalcell/vtest/hgcalcell.xml b/Geometry/HGCalCommonData/data/hgcalcell/vtest/hgcalcell.xml new file mode 100644 index 0000000000000..c3964072d2333 --- /dev/null +++ b/Geometry/HGCalCommonData/data/hgcalcell/vtest/hgcalcell.xml @@ -0,0 +1,60 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + HGCalEECellTrunc01Fine, HGCalEECellTrunc02Fine, + HGCalEECellTrunc03Fine, HGCalEECellTrunc04Fine, + HGCalEECellTrunc05Fine, HGCalEECellTrunc06Fine + + HGCalEESensitiveTrunc01Fine, HGCalEESensitiveTrunc02Fine, + HGCalEESensitiveTrunc03Fine, HGCalEESensitiveTrunc04Fine, + HGCalEESensitiveTrunc05Fine, HGCalEESensitiveTrunc06Fine + + HGCalEECellExten01Fine, HGCalEECellExten02Fine, + HGCalEECellExten03Fine, HGCalEECellExten04Fine, + HGCalEECellExten05Fine, HGCalEECellExten06Fine + + HGCalEESensitiveExten01Fine, HGCalEESensitiveExten02Fine, + HGCalEESensitiveExten03Fine, HGCalEESensitiveExten04Fine, + HGCalEESensitiveExten05Fine, HGCalEESensitiveExten06Fine + + HGCalEECellCorner01Fine, HGCalEECellCorner02Fine, + HGCalEECellCorner03Fine, HGCalEECellCorner04Fine, + HGCalEECellCorner05Fine, HGCalEECellCorner06Fine, + HGCalEECellCorner07Fine, HGCalEECellCorner08Fine, + HGCalEECellCorner09Fine, HGCalEECellCorner10Fine, + HGCalEECellCorner11Fine, HGCalEECellCorner12Fine + + HGCalEESensitiveCorner01Fine, HGCalEESensitiveCorner02Fine, + HGCalEESensitiveCorner03Fine, HGCalEESensitiveCorner04Fine, + HGCalEESensitiveCorner05Fine, HGCalEESensitiveCorner06Fine, + HGCalEESensitiveCorner07Fine, HGCalEESensitiveCorner08Fine, + HGCalEESensitiveCorner09Fine, HGCalEESensitiveCorner10Fine, + HGCalEESensitiveCorner11Fine, HGCalEESensitiveCorner126Fine + + + + diff --git a/Geometry/HGCalCommonData/data/hgcalcell/vtest/hgcalpos.xml b/Geometry/HGCalCommonData/data/hgcalcell/vtest/hgcalpos.xml new file mode 100644 index 0000000000000..047647dc34e9b --- /dev/null +++ b/Geometry/HGCalCommonData/data/hgcalcell/vtest/hgcalpos.xml @@ -0,0 +1,132 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Geometry/HGCalCommonData/data/hgcalwafer/v15f/hgcal.xml b/Geometry/HGCalCommonData/data/hgcalwafer/v15f/hgcal.xml index 234c65d71bf40..cda63eebdeced 100644 --- a/Geometry/HGCalCommonData/data/hgcalwafer/v15f/hgcal.xml +++ b/Geometry/HGCalCommonData/data/hgcalwafer/v15f/hgcal.xml @@ -13,6 +13,7 @@ + diff --git a/Geometry/HGCalCommonData/plugins/DDHGCalCell.cc b/Geometry/HGCalCommonData/plugins/DDHGCalCell.cc index c0f44143da4a5..ec0d567c58fa4 100644 --- a/Geometry/HGCalCommonData/plugins/DDHGCalCell.cc +++ b/Geometry/HGCalCommonData/plugins/DDHGCalCell.cc @@ -105,8 +105,10 @@ void DDHGCalCell::execute(DDCompactView& cpv) { double dy1 = r; double dy2 = 0.5 * dy1; double dy3 = 1.5 * dy1; - std::vector xx = {dx1, dx2, -dx2, -dx1, -dx2, dx2, dx3, -dx4, -dx1, -dx1, -dx4, dx3}; - std::vector yy = {0, dy1, dy1, 0, -dy1, -dy1, dy2, dy3, dy1, -dy1, -dy3, -dy2}; + std::vector xx = { + dx1, dx2, -dx2, -dx1, -dx2, dx2, dx3, dx1, dx4, -dx4, -dx1, -dx3, -dx3, -dx1, -dx4, dx4, dx1, dx3}; + std::vector yy = { + 0, dy1, dy1, 0, -dy1, -dy1, dy2, dy1, dy3, dy3, dy1, dy2, -dy2, -dy1, -dy3, -dy3, -dy1, -dy2}; double zpos = (posSens_ == 0) ? -0.5 * (waferT_ - cellT_) : 0.5 * (waferT_ - cellT_); DDTranslation tran(0, 0, zpos); @@ -143,11 +145,11 @@ void DDHGCalCell::execute(DDCompactView& cpv) { << tran << " with no rotation"; #endif - static constexpr int ir0[] = {0, 1, 0}; - static constexpr int ir1[] = {1, 2, 1}; - static constexpr int ir2[] = {2, 3, 3}; - static constexpr int ir3[] = {3, 4, 4}; - static constexpr int ir4[] = {5, 5, 5}; + static constexpr int ir0[] = {0, 1, 0, 1, 3, 5}; + static constexpr int ir1[] = {1, 2, 1, 2, 4, 0}; + static constexpr int ir2[] = {2, 3, 3, 3, 5, 1}; + static constexpr int ir3[] = {3, 4, 4, 4, 0, 2}; + static constexpr int ir4[] = {5, 5, 5, 0, 2, 4}; for (unsigned int i = 0; i < truncCN_.size(); ++i) { std::vector xw = {xx[ir0[i]], xx[ir1[i]], xx[ir2[i]], xx[ir3[i]], xx[ir4[i]]}; std::vector yw = {yy[ir0[i]], yy[ir1[i]], yy[ir2[i]], yy[ir3[i]], yy[ir4[i]]}; @@ -178,11 +180,11 @@ void DDHGCalCell::execute(DDCompactView& cpv) { #endif } - static constexpr int ie0[] = {1, 5, 0}; - static constexpr int ie1[] = {2, 6, 1}; - static constexpr int ie2[] = {3, 7, 8}; - static constexpr int ie3[] = {10, 3, 9}; - static constexpr int ie4[] = {11, 4, 5}; + static constexpr int ie0[] = {1, 5, 0, 2, 4, 0}; + static constexpr int ie1[] = {2, 6, 1, 3, 5, 1}; + static constexpr int ie2[] = {3, 9, 10, 4, 0, 2}; + static constexpr int ie3[] = {14, 3, 13, 16, 8, 12}; + static constexpr int ie4[] = {17, 4, 5, 7, 11, 15}; for (unsigned int i = 0; i < extenCN_.size(); ++i) { std::vector xw = {xx[ie0[i]], xx[ie1[i]], xx[ie2[i]], xx[ie3[i]], xx[ie4[i]]}; std::vector yw = {yy[ie0[i]], yy[ie1[i]], yy[ie2[i]], yy[ie3[i]], yy[ie4[i]]}; @@ -213,11 +215,11 @@ void DDHGCalCell::execute(DDCompactView& cpv) { #endif } - static constexpr int ic0[] = {0, 1, 1, 1, 1, 0}; - static constexpr int ic1[] = {1, 2, 2, 7, 3, 1}; - static constexpr int ic2[] = {8, 3, 3, 3, 4, 3}; - static constexpr int ic3[] = {3, 5, 10, 4, 5, 9}; - static constexpr int ic4[] = {5, 11, 5, 5, 6, 5}; + static constexpr int ic0[] = {0, 1, 1, 1, 1, 0, 1, 2, 3, 4, 5, 0}; + static constexpr int ic1[] = {1, 2, 2, 9, 3, 1, 2, 3, 4, 5, 0, 1}; + static constexpr int ic2[] = {10, 3, 3, 3, 4, 3, 12, 5, 16, 0, 8, 2}; + static constexpr int ic3[] = {3, 5, 14, 4, 5, 13, 4, 0, 0, 2, 2, 4}; + static constexpr int ic4[] = {5, 17, 5, 5, 6, 5, 0, 7, 2, 11, 4, 15}; for (unsigned int i = 0; i < cornrCN_.size(); ++i) { std::vector xw = {xx[ic0[i]], xx[ic1[i]], xx[ic2[i]], xx[ic3[i]], xx[ic4[i]]}; std::vector yw = {yy[ic0[i]], yy[ic1[i]], yy[ic2[i]], yy[ic3[i]], yy[ic4[i]]}; diff --git a/Geometry/HGCalCommonData/plugins/dd4hep/DDHGCalCell.cc b/Geometry/HGCalCommonData/plugins/dd4hep/DDHGCalCell.cc index f19512ba1f973..2193c8450e4fa 100644 --- a/Geometry/HGCalCommonData/plugins/dd4hep/DDHGCalCell.cc +++ b/Geometry/HGCalCommonData/plugins/dd4hep/DDHGCalCell.cc @@ -40,11 +40,11 @@ static long algorithm(dd4hep::Detector& /* description */, cms::DDParsingContext << " Extended " << extenCN.size() << ":" << extenSensN.size() << " Corners " << cornrCN.size() << ":" << cornrSensN.size(); } - if ((truncCN.size() != 3) || (extenCN.size() != 3) || (cornrCN.size() != 6)) { + if ((truncCN.size() < 3) || (extenCN.size() < 3) || (cornrCN.size() < 6)) { edm::LogError("HGCalGeom") << "DDHGCalCell: The number of cells does not" - << " match with Standard: Truncated " << truncCN.size() << ":3 Extended " - << extenCN.size() << ":3" - << " Corners " << cornrCN.size() << ":6"; + << " match with Standard: Truncated " << truncCN.size() << " < 3 Extended " + << extenCN.size() << " < 3" + << " Corners " << cornrCN.size() << " < 6"; throw cms::Exception("DDException") << "Wrong size of truncated|extended" << "|corner cells: " << truncCN.size() << ":" << extenCN.size() << ":" << cornrCN.size(); @@ -54,11 +54,11 @@ static long algorithm(dd4hep::Detector& /* description */, cms::DDParsingContext << cms::convert2mm(waferT) << " Cell T " << cms::convert2mm(cellT) << " Cells/Wafer " << nCells << " Material " << material << "Sensitive Position " << posSens << " NameSpace " << ns.name() << " Full Cell: " << fullCN << ":" << fullSensN; - for (int k = 0; k < 3; ++k) + for (unsigned int k = 0; k < truncCN.size(); ++k) edm::LogVerbatim("HGCalGeom") << "DDHGCalCell: Truncated Cell[" << k << "] " << truncCN[k] << ":" << truncSensN[k]; - for (int k = 0; k < 3; ++k) + for (unsigned int k = 0; k < extenCN.size(); ++k) edm::LogVerbatim("HGCalGeom") << "DDHGCalCell: Extended Cell[" << k << "] " << extenCN[k] << ":" << extenSensN[k]; - for (int k = 0; k < 6; ++k) + for (unsigned int k = 0; k < cornrCN.size(); ++k) edm::LogVerbatim("HGCalGeom") << "DDHGCalCell: Corner Cell[" << k << "] " << cornrCN[k] << ":" << cornrSensN[k]; #endif @@ -80,8 +80,10 @@ static long algorithm(dd4hep::Detector& /* description */, cms::DDParsingContext double dy1 = r; double dy2 = 0.5 * dy1; double dy3 = 1.5 * dy1; - std::vector xx = {dx1, dx2, -dx2, -dx1, -dx2, dx2, dx3, -dx4, -dx1, -dx1, -dx4, dx3}; - std::vector yy = {0, dy1, dy1, 0, -dy1, -dy1, dy2, dy3, dy1, -dy1, -dy3, -dy2}; + std::vector xx = { + dx1, dx2, -dx2, -dx1, -dx2, dx2, dx3, dx1, dx4, -dx4, -dx1, -dx3, -dx3, -dx1, -dx4, dx4, dx1, dx3}; + std::vector yy = { + 0, dy1, dy1, 0, -dy1, -dy1, dy2, dy1, dy3, dy3, dy1, dy2, -dy2, -dy1, -dy3, -dy3, -dy1, -dy2}; double zpos = (posSens == 0) ? -0.5 * (waferT - cellT) : 0.5 * (waferT - cellT); dd4hep::Position tran(0, 0, zpos); @@ -124,12 +126,12 @@ static long algorithm(dd4hep::Detector& /* description */, cms::DDParsingContext << " at (0,0," << cms::convert2mm(zpos) << ") with no rotation"; #endif - static const int ir0[] = {0, 1, 0}; - static const int ir1[] = {1, 2, 1}; - static const int ir2[] = {2, 3, 3}; - static const int ir3[] = {3, 4, 4}; - static const int ir4[] = {5, 5, 5}; - for (int i = 0; i < 3; ++i) { + static constexpr int ir0[] = {0, 1, 0, 1, 3, 5}; + static constexpr int ir1[] = {1, 2, 1, 2, 4, 0}; + static constexpr int ir2[] = {2, 3, 3, 3, 5, 1}; + static constexpr int ir3[] = {3, 4, 4, 4, 0, 2}; + static constexpr int ir4[] = {5, 5, 5, 0, 2, 4}; + for (unsigned int i = 0; i < truncCN.size(); ++i) { std::vector xw = {xx[ir0[i]], xx[ir1[i]], xx[ir2[i]], xx[ir3[i]], xx[ir4[i]]}; std::vector yw = {yy[ir0[i]], yy[ir1[i]], yy[ir2[i]], yy[ir3[i]], yy[ir4[i]]}; @@ -167,12 +169,12 @@ static long algorithm(dd4hep::Detector& /* description */, cms::DDParsingContext #endif } - static const int ie0[] = {1, 5, 0}; - static const int ie1[] = {2, 6, 1}; - static const int ie2[] = {3, 7, 8}; - static const int ie3[] = {10, 3, 9}; - static const int ie4[] = {11, 4, 5}; - for (int i = 0; i < 3; ++i) { + static constexpr int ie0[] = {1, 5, 0, 2, 4, 0}; + static constexpr int ie1[] = {2, 6, 1, 3, 5, 1}; + static constexpr int ie2[] = {3, 9, 10, 4, 0, 2}; + static constexpr int ie3[] = {14, 3, 13, 16, 8, 12}; + static constexpr int ie4[] = {17, 4, 5, 7, 11, 15}; + for (unsigned int i = 0; i < extenCN.size(); ++i) { std::vector xw = {xx[ie0[i]], xx[ie1[i]], xx[ie2[i]], xx[ie3[i]], xx[ie4[i]]}; std::vector yw = {yy[ie0[i]], yy[ie1[i]], yy[ie2[i]], yy[ie3[i]], yy[ie4[i]]}; solid = dd4hep::ExtrudedPolygon(xw, yw, zw, zx, zy, scale); @@ -208,12 +210,12 @@ static long algorithm(dd4hep::Detector& /* description */, cms::DDParsingContext #endif } - static const int ic0[] = {0, 1, 1, 1, 1, 0}; - static const int ic1[] = {1, 2, 2, 7, 3, 1}; - static const int ic2[] = {8, 3, 3, 3, 4, 3}; - static const int ic3[] = {3, 5, 10, 4, 5, 9}; - static const int ic4[] = {5, 11, 5, 5, 6, 5}; - for (int i = 0; i < 6; ++i) { + static constexpr int ic0[] = {0, 1, 1, 1, 1, 0, 1, 2, 3, 4, 5, 0}; + static constexpr int ic1[] = {1, 2, 2, 9, 3, 1, 2, 3, 4, 5, 0, 1}; + static constexpr int ic2[] = {10, 3, 3, 3, 4, 3, 12, 5, 16, 0, 8, 2}; + static constexpr int ic3[] = {3, 5, 14, 4, 5, 13, 4, 0, 0, 2, 2, 4}; + static constexpr int ic4[] = {5, 17, 5, 5, 6, 5, 0, 7, 2, 11, 4, 15}; + for (unsigned int i = 0; i < cornrCN.size(); ++i) { std::vector xw = {xx[ic0[i]], xx[ic1[i]], xx[ic2[i]], xx[ic3[i]], xx[ic4[i]]}; std::vector yw = {yy[ic0[i]], yy[ic1[i]], yy[ic2[i]], yy[ic3[i]], yy[ic4[i]]}; solid = dd4hep::ExtrudedPolygon(xw, yw, zw, zx, zy, scale); diff --git a/Geometry/HGCalCommonData/python/testHGCalCellTestXML_cfi.py b/Geometry/HGCalCommonData/python/testHGCalCellTestXML_cfi.py new file mode 100644 index 0000000000000..17ad4344b7672 --- /dev/null +++ b/Geometry/HGCalCommonData/python/testHGCalCellTestXML_cfi.py @@ -0,0 +1,13 @@ +import FWCore.ParameterSet.Config as cms + +XMLIdealGeometryESSource = cms.ESSource("XMLIdealGeometryESSource", + geomXMLFiles = cms.vstring('Geometry/CMSCommonData/data/materials.xml', + 'Geometry/CMSCommonData/data/rotations.xml', + 'Geometry/HGCalCommonData/test/cms.xml', + 'Geometry/HGCalCommonData/data/hgcalcell/vtest/hgcal.xml', + 'Geometry/HGCalCommonData/data/hgcalcell/vtest/hgcalcell.xml', + 'Geometry/HGCalCommonData/data/hgcalcell/vtest/hgcalpos.xml'), + rootNodeName = cms.string('cms:OCMS') +) + + diff --git a/HLTrigger/Configuration/python/HLT_FULL_cff.py b/HLTrigger/Configuration/python/HLT_FULL_cff.py index 31d0c848c7f95..c220b4eacfc01 100644 --- a/HLTrigger/Configuration/python/HLT_FULL_cff.py +++ b/HLTrigger/Configuration/python/HLT_FULL_cff.py @@ -1,13 +1,13 @@ # hltGetConfiguration --cff --data /dev/CMSSW_12_1_0/HLT --type FULL -# /dev/CMSSW_12_1_0/HLT/V23 (CMSSW_12_1_0_pre4) +# /dev/CMSSW_12_1_0/HLT/V27 (CMSSW_12_1_0_pre5) import FWCore.ParameterSet.Config as cms fragment = cms.ProcessFragment( "HLT" ) fragment.HLTConfigVersion = cms.PSet( - tableName = cms.string('/dev/CMSSW_12_1_0/HLT/V23') + tableName = cms.string('/dev/CMSSW_12_1_0/HLT/V27') ) fragment.transferSystem = cms.PSet( @@ -6759,11 +6759,6 @@ fragment.TransientTrackBuilderESProducer = cms.ESProducer( "TransientTrackBuilderESProducer", ComponentName = cms.string( "TransientTrackBuilder" ) ) -fragment.XMLIdealGeometryESSource_CTPPS = cms.ESProducer( "XMLIdealGeometryESProducer", - rootDDName = cms.string( "cms:CMSE" ), - label = cms.string( "CTPPS" ), - appendToDataLabel = cms.string( "XMLIdealGeometryESSource_CTPPS" ) -) fragment.caloDetIdAssociator = cms.ESProducer( "DetIdAssociatorESProducer", ComponentName = cms.string( "CaloDetIdAssociator" ), etaBinSize = cms.double( 0.087 ), @@ -6783,8 +6778,8 @@ buildMisalignedGeometry = cms.bool( False ), isRun2 = cms.bool( False ), dbTag = cms.string( "" ), - compactViewTag = cms.string( "XMLIdealGeometryESSource_CTPPS" ), - fromPreprocessedDB = cms.untracked.bool( False ), + compactViewTag = cms.string( "" ), + fromPreprocessedDB = cms.untracked.bool( True ), fromDD4hep = cms.untracked.bool( False ), appendToDataLabel = cms.string( "" ) ) @@ -33318,7 +33313,9 @@ fragment.hltL1JetsHLTPFTauTrackLooseChargedIsolationMatch = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sBigORLooseIsoEGXXerIsoTauYYerdRMin0p3" ), JetSrc = cms.InputTag( "hltSelectedPFTausTrackFindingLooseChargedIsolation" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) fragment.hltSelectedPFTau30LooseChargedIsolationL1HLTMatched = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -33357,14 +33354,16 @@ L1GtReadoutRecordTag = cms.InputTag( "hltGtStage2Digis" ) ) fragment.hltStripTrackerHVOn = cms.EDFilter( "DetectorStateFilter", - DetectorType = cms.untracked.string( "sistrip" ), DebugOn = cms.untracked.bool( False ), - DcsStatusLabel = cms.untracked.InputTag( "hltScalersRawToDigi" ) + DetectorType = cms.untracked.string( "sistrip" ), + DcsStatusLabel = cms.untracked.InputTag( "hltScalersRawToDigi" ), + DCSRecordLabel = cms.untracked.InputTag( "onlineMetaDataDigis" ) ) fragment.hltPixelTrackerHVOn = cms.EDFilter( "DetectorStateFilter", - DetectorType = cms.untracked.string( "pixel" ), DebugOn = cms.untracked.bool( False ), - DcsStatusLabel = cms.untracked.InputTag( "hltScalersRawToDigi" ) + DetectorType = cms.untracked.string( "pixel" ), + DcsStatusLabel = cms.untracked.InputTag( "hltScalersRawToDigi" ), + DCSRecordLabel = cms.untracked.InputTag( "onlineMetaDataDigis" ) ) fragment.hltHpsTauPFJetsRecoTauChargedHadronsWithNeutrals = cms.EDProducer( "PFRecoTauChargedHadronProducer", ranking = cms.VPSet( @@ -34115,7 +34114,9 @@ fragment.hltHpsL1JetsHLTPFTauTrackLooseChargedIsolationMatch = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sBigORLooseIsoEGXXerIsoTauYYerdRMin0p3" ), JetSrc = cms.InputTag( "hltHpsSelectedPFTausTrackFindingLooseChargedIsolation" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) fragment.hltHpsSelectedPFTau30LooseChargedIsolationL1HLTMatched = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -34384,7 +34385,9 @@ fragment.hltHpsL1JetsHLTPFTauTrackMediumChargedIsolationMatch = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sBigORLooseIsoEGXXerIsoTauYYerdRMin0p3" ), JetSrc = cms.InputTag( "hltHpsSelectedPFTausTrackFindingMediumChargedIsolation" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) fragment.hltHpsSelectedPFTau30MediumChargedIsolationL1HLTMatched = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -34653,7 +34656,9 @@ fragment.hltHpsL1JetsHLTPFTauTrackTightChargedIsolationMatch = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sBigORLooseIsoEGXXerIsoTauYYerdRMin0p3" ), JetSrc = cms.InputTag( "hltHpsSelectedPFTausTrackFindingTightChargedIsolation" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) fragment.hltHpsSelectedPFTau30TightChargedIsolationL1HLTMatched = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -34816,7 +34821,9 @@ fragment.hltHpsL1JetsHLTPFTauTrackLooseChargedIsolationTightOOSCPhotonsMatch = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sBigORLooseIsoEGXXerIsoTauYYerdRMin0p3" ), JetSrc = cms.InputTag( "hltHpsSelectedPFTausTrackFindingLooseChargedIsolationTightOOSCPhotons" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) fragment.hltHpsSelectedPFTau30LooseChargedIsolationTightOOSCPhotonsL1HLTMatched = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -34886,7 +34893,9 @@ fragment.hltHpsL1JetsHLTPFTauTrackMediumChargedIsolationTightOOSCPhotonsMatch = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sBigORLooseIsoEGXXerIsoTauYYerdRMin0p3" ), JetSrc = cms.InputTag( "hltHpsSelectedPFTausTrackFindingMediumChargedIsolationTightOOSCPhotons" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) fragment.hltHpsSelectedPFTau30MediumChargedIsolationTightOOSCPhotonsL1HLTMatched = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -34956,7 +34965,9 @@ fragment.hltHpsL1JetsHLTPFTauTrackTightChargedIsolationTightOOSCPhotonsMatch = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sBigORLooseIsoEGXXerIsoTauYYerdRMin0p3" ), JetSrc = cms.InputTag( "hltHpsSelectedPFTausTrackFindingTightChargedIsolationTightOOSCPhotons" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) fragment.hltHpsSelectedPFTau30TightChargedIsolationTightOOSCPhotonsL1HLTMatched = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -35906,7 +35917,9 @@ fragment.hltL1JetsHLTPFTauTrackLooseChargedIsolationAgainstMuonMatch = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sBigORMu18erTauXXer2p1" ), JetSrc = cms.InputTag( "hltSelectedPFTausTrackFindingLooseChargedIsolationAgainstMuon" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) fragment.hltSelectedPFTau27LooseChargedIsolationAgainstMuonL1HLTMatched = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -36032,7 +36045,9 @@ fragment.hltHpsL1JetsHLTPFTauTrackLooseChargedIsolationAgainstMuonMatch = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sBigORMu18erTauXXer2p1" ), JetSrc = cms.InputTag( "hltHpsSelectedPFTausTrackFindingLooseChargedIsolationAgainstMuon" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) fragment.hltHpsSelectedPFTau27LooseChargedIsolationAgainstMuonL1HLTMatched = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -36114,7 +36129,9 @@ fragment.hltHpsL1JetsHLTPFTauTrackMediumChargedIsolationAgainstMuonMatch = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sBigORMu18erTauXXer2p1" ), JetSrc = cms.InputTag( "hltHpsSelectedPFTausTrackFindingMediumChargedIsolationAgainstMuon" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) fragment.hltHpsSelectedPFTau27MediumChargedIsolationAgainstMuonL1HLTMatched = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -36196,7 +36213,9 @@ fragment.hltHpsL1JetsHLTPFTauTrackTightChargedIsolationAgainstMuonMatch = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sBigORMu18erTauXXer2p1" ), JetSrc = cms.InputTag( "hltHpsSelectedPFTausTrackFindingTightChargedIsolationAgainstMuon" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) fragment.hltHpsSelectedPFTau27TightChargedIsolationAgainstMuonL1HLTMatched = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -36269,7 +36288,9 @@ fragment.hltHpsL1JetsHLTPFTauTrackLooseChargedIsolationTightOOSCPhotonsAgainstMuonMatch = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sBigORMu18erTauXXer2p1" ), JetSrc = cms.InputTag( "hltHpsSelectedPFTausTrackFindingLooseChargedIsolationTightOOSCPhotonsAgainstMuon" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) fragment.hltHpsSelectedPFTau27LooseChargedIsolationTightOOSCPhotonsAgainstMuonL1HLTMatched = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -36342,7 +36363,9 @@ fragment.hltHpsL1JetsHLTPFTauTrackMediumChargedIsolationTightOOSCPhotonsAgainstMuonMatch = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sBigORMu18erTauXXer2p1" ), JetSrc = cms.InputTag( "hltHpsSelectedPFTausTrackFindingMediumChargedIsolationTightOOSCPhotonsAgainstMuon" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) fragment.hltHpsSelectedPFTau27MediumChargedIsolationTightOOSCPhotonsAgainstMuonL1HLTMatched = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -36415,7 +36438,9 @@ fragment.hltHpsL1JetsHLTPFTauTrackTightChargedIsolationTightOOSCPhotonsAgainstMuonMatch = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sBigORMu18erTauXXer2p1" ), JetSrc = cms.InputTag( "hltHpsSelectedPFTausTrackFindingTightChargedIsolationTightOOSCPhotonsAgainstMuon" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) fragment.hltHpsSelectedPFTau27TightChargedIsolationTightOOSCPhotonsAgainstMuonL1HLTMatched = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -39119,7 +39144,9 @@ fragment.hltL1JetsHLTPFTauTrackPt1MediumChargedIsolationMatchReg = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sBigOrMuXXerIsoTauYYer" ), JetSrc = cms.InputTag( "hltSelectedPFTausTrackPt1MediumChargedIsolationReg" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) fragment.hltSelectedPFTau35TrackPt1MediumChargedIsolationL1HLTMatchedReg = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -39283,7 +39310,9 @@ fragment.hltL1JetsHLTPFTauTrackPt1MediumChargedIsolationAndTightOOSCPhotonsMatchReg = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sBigOrMuXXerIsoTauYYer" ), JetSrc = cms.InputTag( "hltSelectedPFTausTrackPt1MediumChargedIsolationAndTightOOSCPhotonsReg" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) fragment.hltSelectedPFTau35TrackPt1MediumChargedIsolationAndTightOOSCPhotonsL1HLTMatchedReg = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -39540,7 +39569,9 @@ fragment.hltL1JetsHLTPFTauTrackPt1TightChargedIsolationMatchReg = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sBigOrMuXXerIsoTauYYer" ), JetSrc = cms.InputTag( "hltSelectedPFTausTrackPt1TightChargedIsolationReg" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) fragment.hltSelectedPFTau35TrackPt1TightChargedIsolationL1HLTMatchedReg = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -39611,7 +39642,9 @@ fragment.hltL1JetsHLTPFTauTrackPt1TightChargedIsolationAndTightOOSCPhotonsMatchReg = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sBigOrMuXXerIsoTauYYer" ), JetSrc = cms.InputTag( "hltSelectedPFTausTrackPt1TightChargedIsolationAndTightOOSCPhotonsReg" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) fragment.hltSelectedPFTau35TrackPt1TightChargedIsolationAndTightOOSCPhotonsL1HLTMatchedReg = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -40403,7 +40436,9 @@ fragment.hltHpsL1JetsHLTPFTauTrackPt1TightChargedIsolationMatchReg = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sBigOrMuXXerIsoTauYYer" ), JetSrc = cms.InputTag( "hltHpsSelectedPFTausTrackPt1TightChargedIsolationReg" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) fragment.hltHpsSelectedPFTau35TrackPt1TightChargedIsolationL1HLTMatchedReg = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -40769,7 +40804,9 @@ fragment.hltHpsL1JetsHLTPFTauTrackPt1MediumChargedIsolationAndTightOOSCPhotonsMatchReg = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sBigOrMuXXerIsoTauYYer" ), JetSrc = cms.InputTag( "hltHpsSelectedPFTausTrackPt1MediumChargedIsolationAndTightOOSCPhotonsReg" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) fragment.hltHpsSelectedPFTau35TrackPt1MediumChargedIsolationAndTightOOSCPhotonsL1HLTMatchedReg = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -40840,7 +40877,9 @@ fragment.hltHpsL1JetsHLTPFTauTrackPt1TightChargedIsolationAndTightOOSCPhotonsMatchReg = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sBigOrMuXXerIsoTauYYer" ), JetSrc = cms.InputTag( "hltHpsSelectedPFTausTrackPt1TightChargedIsolationAndTightOOSCPhotonsReg" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) fragment.hltHpsSelectedPFTau35TrackPt1TightChargedIsolationAndTightOOSCPhotonsL1HLTMatchedReg = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -40895,7 +40934,9 @@ fragment.hltHpsL1JetsHLTPFTauTrackPt1MediumChargedIsolationMatchReg = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sBigOrMuXXerIsoTauYYer" ), JetSrc = cms.InputTag( "hltHpsSelectedPFTausTrackPt1MediumChargedIsolationReg" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) fragment.hltHpsSelectedPFTau35TrackPt1MediumChargedIsolationL1HLTMatchedReg = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -41097,7 +41138,9 @@ fragment.hltHpsL1JetsHLTPFTauTrackPt1MediumChargedIsolationMatchForMu22Tau28Reg = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sMu22erIsoTau28er" ), JetSrc = cms.InputTag( "hltHpsSelectedPFTausTrackPt1MediumChargedIsolationReg" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) fragment.hltHpsSelectedPFTau30TrackPt1MediumChargedIsolationL1HLTMatchedReg = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -81085,6 +81128,22 @@ applyWeight = cms.bool( False ), srcWeights = cms.InputTag( "" ) ) +fragment.hltEgammaEleGsfTrackIsoPixelOnly = cms.EDProducer( "EgammaHLTElectronTrackIsolationProducers", + electronProducer = cms.InputTag( "hltEgammaGsfElectrons" ), + trackProducer = cms.InputTag( "hltPixelTracksZetaClean" ), + recoEcalCandidateProducer = cms.InputTag( "hltEgammaCandidates" ), + beamSpotProducer = cms.InputTag( "hltOnlineBeamSpot" ), + egTrkIsoPtMin = cms.double( 1.0 ), + egTrkIsoConeSize = cms.double( 0.2 ), + egTrkIsoZSpan = cms.double( 0.15 ), + egTrkIsoRSpan = cms.double( 999999.0 ), + egTrkIsoVetoConeSizeBarrel = cms.double( 0.03 ), + egTrkIsoVetoConeSizeEndcap = cms.double( 0.03 ), + egTrkIsoStripBarrel = cms.double( 0.01 ), + egTrkIsoStripEndcap = cms.double( 0.01 ), + useGsfTrack = cms.bool( True ), + useSCRefs = cms.bool( True ) +) fragment.hltDisplacedmumuVtxNoMatchingProducer = cms.EDProducer( "HLTDisplacedmumuVtxProducer", Src = cms.InputTag( "hltIterL3MuonCandidatesNoVtx" ), PreviousCandTag = cms.InputTag( "hltDoubleMu3L3FilteredNoVtx" ), @@ -91614,7 +91673,9 @@ fragment.hltL1JetsHLTPFTau50Track30MediumChargedIsolationMatchMu22IsoTau40 = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sMu22erIsoTau40er" ), JetSrc = cms.InputTag( "hltSelectedPFTausTrackPt30MediumAbsOrRelIsolation1Prong" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) fragment.hltSelectedPFTau50MediumChargedIsolationL1HLTMatchedMu22IsoTau40 = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -91646,7 +91707,9 @@ fragment.hltL1JetsHLTPFTau50Track30MediumChargedIsolationMatch = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sIsoTau40erETMHF90To120" ), JetSrc = cms.InputTag( "hltSelectedPFTausTrackPt30MediumAbsOrRelIsolation1Prong" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) fragment.hltSelectedPFTau50MediumChargedIsolationL1HLTMatched = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -91722,7 +91785,9 @@ fragment.hltL1JetsHLTPFTau50Track30MediumChargedIsolationMatchQuadJetIsoTau = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sQuadJet36IsoTau52" ), JetSrc = cms.InputTag( "hltSelectedPFTausTrackPt30MediumAbsOrRelIsolation1Prong" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) fragment.hltSelectedPFTau50MediumChargedIsolationL1HLTMatchedQuadIsoTau = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -92027,7 +92092,9 @@ fragment.hltL1JetsHLTPFTauTrackMediumChargedIsolationMatch1Prong = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sSingleTau" ), JetSrc = cms.InputTag( "hltSelectedPFTausTrackPt50AbsOrRelMediumHighPtRelaxedIsoIsolation1Prong" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) fragment.hltSelectedPFTau180MediumChargedIsolationL1HLTMatched1Prong = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -92060,7 +92127,9 @@ fragment.hltL1JetsHLTSinglePFTauTrackMediumChargedIsolationMatch = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sSingleTau" ), JetSrc = cms.InputTag( "hltSelectedPFTausTrackPt50AbsOrRelMediumHighPtRelaxedIsoIsolation" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) fragment.hltSelectedPFTau180MediumChargedIsolationL1HLTMatched = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -92923,7 +92992,9 @@ fragment.hltL1JetsHLTDoublePFTauTrackPt1MediumChargedIsolationMatchReg = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sDoubleTauBigOR" ), JetSrc = cms.InputTag( "hltSelectedPFTausTrackPt1MediumChargedIsolationReg" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) fragment.hltDoublePFTau35TrackPt1MediumChargedIsolationL1HLTMatchedReg = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -92965,7 +93036,9 @@ fragment.hltL1JetsHLTDoublePFTauTrackPt1MediumChargedIsolationAndTightOOSCPhotonsMatchReg = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sDoubleTauBigOR" ), JetSrc = cms.InputTag( "hltSelectedPFTausTrackPt1MediumChargedIsolationAndTightOOSCPhotonsReg" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) fragment.hltDoublePFTau35TrackPt1MediumChargedIsolationAndTightOOSCPhotonsL1HLTMatchedReg = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -93007,7 +93080,9 @@ fragment.hltL1JetsHLTDoublePFTauTrackPt1TightChargedIsolationMatchReg = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sDoubleTauBigOR" ), JetSrc = cms.InputTag( "hltSelectedPFTausTrackPt1TightChargedIsolationReg" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) fragment.hltDoublePFTau35TrackPt1TightChargedIsolationL1HLTMatchedReg = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -93049,7 +93124,9 @@ fragment.hltL1JetsHLTDoublePFTauTrackPt1TightChargedIsolationAndTightOOSCPhotonsMatchReg = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sDoubleTauBigOR" ), JetSrc = cms.InputTag( "hltSelectedPFTausTrackPt1TightChargedIsolationAndTightOOSCPhotonsReg" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) fragment.hltDoublePFTau35TrackPt1TightChargedIsolationAndTightOOSCPhotonsL1HLTMatchedReg = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -93126,7 +93203,9 @@ fragment.hltHpsL1JetsHLTDoublePFTau30TrackPt1MediumChargedIsolationMatchReg = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sDoubleTauMaxMass" ), JetSrc = cms.InputTag( "hltHpsSelectedPFTausTrackPt1MediumChargedIsolationReg" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) fragment.hltHpsDoublePFTau30TrackPt1MediumChargedIsolationL1HLTMatchedReg = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -93192,7 +93271,9 @@ fragment.hltHpsL1JetsHLTDoublePFTauTrackPt1TightChargedIsolationMatchReg = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sDoubleTauBigOR" ), JetSrc = cms.InputTag( "hltHpsSelectedPFTausTrackPt1TightChargedIsolationReg" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) fragment.hltHpsDoublePFTau35TrackPt1TightChargedIsolationL1HLTMatchedReg = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -93234,7 +93315,9 @@ fragment.hltHpsL1JetsHLTDoublePFTauTrackPt1MediumChargedIsolationAndTightOOSCPhotonsMatchReg = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sDoubleTauBigOR" ), JetSrc = cms.InputTag( "hltHpsSelectedPFTausTrackPt1MediumChargedIsolationAndTightOOSCPhotonsReg" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) fragment.hltHpsDoublePFTau35TrackPt1MediumChargedIsolationAndTightOOSCPhotonsL1HLTMatchedReg = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -93276,7 +93359,9 @@ fragment.hltHpsL1JetsHLTDoublePFTauTrackPt1MediumChargedIsolationMatchReg = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sDoubleTauBigOR" ), JetSrc = cms.InputTag( "hltHpsSelectedPFTausTrackPt1MediumChargedIsolationReg" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) fragment.hltHpsDoublePFTau35TrackPt1MediumChargedIsolationL1HLTMatchedReg = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -93318,7 +93403,9 @@ fragment.hltHpsL1JetsHLTDoublePFTauTrackPt1TightChargedIsolationAndTightOOSCPhotonsMatchReg = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sDoubleTauBigOR" ), JetSrc = cms.InputTag( "hltHpsSelectedPFTausTrackPt1TightChargedIsolationAndTightOOSCPhotonsReg" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) fragment.hltHpsDoublePFTau35TrackPt1TightChargedIsolationAndTightOOSCPhotonsL1HLTMatchedReg = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -123036,7 +123123,7 @@ fedList = cms.vuint32( 1404 ) ) fragment.hltScoutingPFPacker = cms.EDProducer( "HLTScoutingPFProducer", - pfJetCollection = cms.InputTag( "hltAK4PixelOnlyPFJets" ), + pfJetCollection = cms.InputTag( 'hltAK4PixelOnlyPFJets','','@currentProcess' ), pfJetTagCollection = cms.InputTag( 'hltCombinedSecondaryVertexBJetTagsPF','','@currentProcess' ), pfCandidateCollection = cms.InputTag( 'hltPixelOnlyParticleFlow','','@currentProcess' ), vertexCollection = cms.InputTag( 'hltPixelVertices','','@currentProcess' ), @@ -123046,20 +123133,20 @@ pfJetEtaCut = cms.double( 3.0 ), pfCandidatePtCut = cms.double( 0.6 ), pfCandidateEtaCut = cms.double( 3.0 ), - mantissaPrecision = cms.int32( 23 ), + mantissaPrecision = cms.int32( 10 ), doJetTags = cms.bool( True ), doCandidates = cms.bool( True ), doMet = cms.bool( True ) ) fragment.hltScoutingMuonPacker = cms.EDProducer( "HLTScoutingMuonProducer", - ChargedCandidates = cms.InputTag( 'hltIterL3MuonCandidatesScoutingNoVtx','','@currentProcess' ), + ChargedCandidates = cms.InputTag( 'hltIterL3MuonCandidatesNoVtx','','@currentProcess' ), displacedvertexCollection = cms.InputTag( 'hltDisplacedmumuVtxNoMatchingProducer','','@currentProcess' ), - InputMuons = cms.InputTag( "hltIterL3MuonsScoutingNoVtx" ), - InputLinks = cms.InputTag( 'hltL3MuonsIterL3LinksScoutingNoVtx','','@currentProcess' ), - Tracks = cms.InputTag( "hltIterL3MuonAndMuonFromL1MergedScoutingNoVtx" ), - EcalPFClusterIsoMap = cms.InputTag( 'hltMuonEcalMFPFClusterIsoForMuonsScoutingNoVtx','','@currentProcess' ), - HcalPFClusterIsoMap = cms.InputTag( 'hltMuonHcalPFClusterIsoForMuonsScoutingNoVtx','','@currentProcess' ), - TrackIsoMap = cms.InputTag( 'hltMuonTkRelIsolationCut0p09MapScoutingNoVtx','combinedRelativeIsoDeposits','@currentProcess' ), + InputMuons = cms.InputTag( "hltIterL3MuonsNoVtx" ), + InputLinks = cms.InputTag( 'hltL3MuonsIterL3LinksNoVtx','','@currentProcess' ), + Tracks = cms.InputTag( "hltIterL3MuonAndMuonFromL1MergedNoVtx" ), + EcalPFClusterIsoMap = cms.InputTag( 'hltMuonEcalMFPFClusterIsoForMuonsNoVtx','','@currentProcess' ), + HcalPFClusterIsoMap = cms.InputTag( 'hltMuonHcalPFClusterIsoForMuonsNoVtx','','@currentProcess' ), + TrackIsoMap = cms.InputTag( 'hltMuonTkRelIsolationCut0p09MapNoVtx','combinedRelativeIsoDeposits','@currentProcess' ), muonPtCut = cms.double( 0.0 ), muonEtaCut = cms.double( 2.4 ), minVtxProbCut = cms.double( 0.001 ) @@ -123075,7 +123162,7 @@ MissingHitsMap = cms.InputTag( 'hltEgammaGsfTrackVars','MissingHits','@currentProcess' ), OneOEMinusOneOPMap = cms.InputTag( 'hltEgammaGsfTrackVars','OneOESuperMinusOneOP','@currentProcess' ), EcalPFClusterIsoMap = cms.InputTag( 'hltEgammaEcalPFClusterIso','','@currentProcess' ), - EleGsfTrackIsoMap = cms.InputTag( 'hltEgammaEleGsfTrackIso','','@currentProcess' ), + EleGsfTrackIsoMap = cms.InputTag( 'hltEgammaEleGsfTrackIsoPixelOnly','','@currentProcess' ), HcalPFClusterIsoMap = cms.InputTag( 'hltEgammaHcalPFClusterIso','','@currentProcess' ), egammaPtCut = cms.double( 2.0 ), egammaEtaCut = cms.double( 2.5 ), @@ -123596,7 +123683,9 @@ fragment.HLTAK4PixelOnlyPFCorrectorProducersSequence = cms.Sequence( fragment.hltAK4PixelOnlyPFFastJetCorrector + fragment.hltAK4PixelOnlyPFRelativeCorrector + fragment.hltAK4PixelOnlyPFAbsoluteCorrector + fragment.hltAK4PixelOnlyPFResidualCorrector + fragment.hltAK4PixelOnlyPFCorrector ) fragment.HLTAK4PixelOnlyPFJetsCorrectionSequence = cms.Sequence( fragment.hltFixedGridRhoFastjetPixelOnlyAll + fragment.HLTAK4PixelOnlyPFCorrectorProducersSequence + fragment.hltAK4PixelOnlyPFJetsCorrected + fragment.hltAK4PixelOnlyPFJetsLooseIDCorrected + fragment.hltAK4PixelOnlyPFJetsTightIDCorrected ) fragment.HLTAK4PixelOnlyPFJetsSequence = cms.Sequence( fragment.HLTPreAK4PFJetsRecoSequence + fragment.HLTAK4PixelOnlyPFJetsReconstructionSequence + fragment.HLTAK4PixelOnlyPFJetsCorrectionSequence ) -fragment.HLTPixelOnlyPFScoutingSequence = cms.Sequence( fragment.HLTAK4PixelOnlyPFJetsSequence + fragment.hltPixelOnlyPFMETProducer + fragment.HLTMuIsolationSequence + fragment.HLTDoFullUnpackingEgammaEcalSequence + fragment.HLTPFClusteringForEgamma + fragment.hltEgammaCandidates + fragment.hltEgammaClusterShape + fragment.HLTDoLocalHcalSequence + fragment.HLTFastJetForEgamma + fragment.hltEgammaHoverE + fragment.hltEgammaEcalPFClusterIso + fragment.HLTPFHcalClustering + fragment.hltEgammaHcalPFClusterIso + fragment.HLTElePixelMatchSequence + fragment.HLTGsfElectronSequence + fragment.HLTTrackReconstructionForIsoElectronIter02 + fragment.hltEgammaEleGsfTrackIso ) +fragment.HLTTrackReconstructionForPixelOnlyPFNoMu = cms.Sequence( fragment.HLTDoLocalPixelSequence + fragment.HLTRecopixelvertexingSequence ) +fragment.HLTTrackReconstructionForIsoElectronPixelOnly = cms.Sequence( fragment.HLTPreAK4PFJetsRecoSequence + fragment.HLTTrackReconstructionForPixelOnlyPFNoMu + fragment.hltPixelTracksZetaClean ) +fragment.HLTPixelOnlyPFScoutingSequence = cms.Sequence( fragment.HLTAK4PixelOnlyPFJetsSequence + fragment.hltPixelOnlyPFMETProducer + fragment.HLTMuIsolationSequence + fragment.HLTDoFullUnpackingEgammaEcalSequence + fragment.HLTPFClusteringForEgamma + fragment.hltEgammaCandidates + fragment.hltEgammaClusterShape + fragment.HLTDoLocalHcalSequence + fragment.HLTFastJetForEgamma + fragment.hltEgammaHoverE + fragment.hltEgammaEcalPFClusterIso + fragment.HLTPFHcalClustering + fragment.hltEgammaHcalPFClusterIso + fragment.HLTElePixelMatchSequence + fragment.HLTGsfElectronSequence + fragment.HLTTrackReconstructionForIsoElectronPixelOnly + fragment.hltEgammaEleGsfTrackIsoPixelOnly ) fragment.HLTRecopixelvertexingForHighMultSequence = cms.Sequence( fragment.hltPixelTracksForHighMultFilter + fragment.hltPixelTracksForHighMultFitter + fragment.hltPixelTracksTrackingRegionsForHighMult + fragment.hltPixelLayerQuadruplets + fragment.hltPixelTracksHitDoubletsForHighMult + fragment.hltPixelTracksHitQuadrupletsForHighMult + fragment.hltPixelTracksForHighMult + fragment.hltPixelVerticesForHighMult ) fragment.HLTDoHIEcalClusWithCleaningSequence = cms.Sequence( fragment.hltIslandBasicClustersHI + fragment.hltHiIslandSuperClustersHI + fragment.hltHiCorrectedIslandBarrelSuperClustersHI + fragment.hltHiCorrectedIslandEndcapSuperClustersHI + fragment.hltCleanedHiCorrectedIslandBarrelSuperClustersHI + fragment.hltRecoHIEcalWithCleaningCandidate ) fragment.HLTPhoton20SequenceLooseHOverE = cms.Sequence( fragment.HLTDoFullUnpackingEgammaEcalSequence + fragment.HLTPFClusteringForEgamma + fragment.hltEgammaCandidates + fragment.hltEGL1SingleEG10Filter + fragment.hltEG20EtFilterLooseHoverE + fragment.HLTDoLocalHcalSequence + fragment.HLTFastJetForEgamma + fragment.hltEgammaHoverE + fragment.hltEG20HEFilterLooseHoverE ) diff --git a/HLTrigger/Configuration/python/HLT_Fake1_cff.py b/HLTrigger/Configuration/python/HLT_Fake1_cff.py index 6da376fae6bc5..6641f4c7e894b 100644 --- a/HLTrigger/Configuration/python/HLT_Fake1_cff.py +++ b/HLTrigger/Configuration/python/HLT_Fake1_cff.py @@ -1,13 +1,13 @@ # hltGetConfiguration --cff --data /dev/CMSSW_12_1_0/Fake1 --type Fake1 -# /dev/CMSSW_12_1_0/Fake1/V4 (CMSSW_12_1_0_pre4) +# /dev/CMSSW_12_1_0/Fake1/V5 (CMSSW_12_1_0_pre5) import FWCore.ParameterSet.Config as cms fragment = cms.ProcessFragment( "HLT" ) fragment.HLTConfigVersion = cms.PSet( - tableName = cms.string('/dev/CMSSW_12_1_0/Fake1/V4') + tableName = cms.string('/dev/CMSSW_12_1_0/Fake1/V5') ) fragment.streams = cms.PSet( A = cms.vstring( 'InitialPD' ) ) diff --git a/HLTrigger/Configuration/python/HLT_Fake2_cff.py b/HLTrigger/Configuration/python/HLT_Fake2_cff.py index b6cb1c3b2b978..11ccdfc931f37 100644 --- a/HLTrigger/Configuration/python/HLT_Fake2_cff.py +++ b/HLTrigger/Configuration/python/HLT_Fake2_cff.py @@ -1,13 +1,13 @@ # hltGetConfiguration --cff --data /dev/CMSSW_12_1_0/Fake2 --type Fake2 -# /dev/CMSSW_12_1_0/Fake2/V4 (CMSSW_12_1_0_pre4) +# /dev/CMSSW_12_1_0/Fake2/V5 (CMSSW_12_1_0_pre5) import FWCore.ParameterSet.Config as cms fragment = cms.ProcessFragment( "HLT" ) fragment.HLTConfigVersion = cms.PSet( - tableName = cms.string('/dev/CMSSW_12_1_0/Fake2/V4') + tableName = cms.string('/dev/CMSSW_12_1_0/Fake2/V5') ) fragment.streams = cms.PSet( A = cms.vstring( 'InitialPD' ) ) diff --git a/HLTrigger/Configuration/python/HLT_Fake_cff.py b/HLTrigger/Configuration/python/HLT_Fake_cff.py index 7bc3ab76ae254..615962c9a587b 100644 --- a/HLTrigger/Configuration/python/HLT_Fake_cff.py +++ b/HLTrigger/Configuration/python/HLT_Fake_cff.py @@ -1,13 +1,13 @@ # hltGetConfiguration --cff --data /dev/CMSSW_12_1_0/Fake --type Fake -# /dev/CMSSW_12_1_0/Fake/V4 (CMSSW_12_1_0_pre4) +# /dev/CMSSW_12_1_0/Fake/V5 (CMSSW_12_1_0_pre5) import FWCore.ParameterSet.Config as cms fragment = cms.ProcessFragment( "HLT" ) fragment.HLTConfigVersion = cms.PSet( - tableName = cms.string('/dev/CMSSW_12_1_0/Fake/V4') + tableName = cms.string('/dev/CMSSW_12_1_0/Fake/V5') ) fragment.streams = cms.PSet( A = cms.vstring( 'InitialPD' ) ) diff --git a/HLTrigger/Configuration/python/HLT_GRun_cff.py b/HLTrigger/Configuration/python/HLT_GRun_cff.py index c37e913dcf891..0801c33ab0346 100644 --- a/HLTrigger/Configuration/python/HLT_GRun_cff.py +++ b/HLTrigger/Configuration/python/HLT_GRun_cff.py @@ -1,13 +1,13 @@ # hltGetConfiguration --cff --data /dev/CMSSW_12_1_0/GRun --type GRun -# /dev/CMSSW_12_1_0/GRun/V10 (CMSSW_12_1_0_pre4) +# /dev/CMSSW_12_1_0/GRun/V12 (CMSSW_12_1_0_pre5) import FWCore.ParameterSet.Config as cms fragment = cms.ProcessFragment( "HLT" ) fragment.HLTConfigVersion = cms.PSet( - tableName = cms.string('/dev/CMSSW_12_1_0/GRun/V10') + tableName = cms.string('/dev/CMSSW_12_1_0/GRun/V12') ) fragment.transferSystem = cms.PSet( @@ -5396,11 +5396,6 @@ fragment.TransientTrackBuilderESProducer = cms.ESProducer( "TransientTrackBuilderESProducer", ComponentName = cms.string( "TransientTrackBuilder" ) ) -fragment.XMLIdealGeometryESSource_CTPPS = cms.ESProducer( "XMLIdealGeometryESProducer", - rootDDName = cms.string( "cms:CMSE" ), - label = cms.string( "CTPPS" ), - appendToDataLabel = cms.string( "XMLIdealGeometryESSource_CTPPS" ) -) fragment.caloDetIdAssociator = cms.ESProducer( "DetIdAssociatorESProducer", ComponentName = cms.string( "CaloDetIdAssociator" ), etaBinSize = cms.double( 0.087 ), @@ -5420,8 +5415,8 @@ buildMisalignedGeometry = cms.bool( False ), isRun2 = cms.bool( False ), dbTag = cms.string( "" ), - compactViewTag = cms.string( "XMLIdealGeometryESSource_CTPPS" ), - fromPreprocessedDB = cms.untracked.bool( False ), + compactViewTag = cms.string( "" ), + fromPreprocessedDB = cms.untracked.bool( True ), fromDD4hep = cms.untracked.bool( False ), appendToDataLabel = cms.string( "" ) ) @@ -31907,7 +31902,9 @@ fragment.hltL1JetsHLTPFTauTrackLooseChargedIsolationMatch = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sBigORLooseIsoEGXXerIsoTauYYerdRMin0p3" ), JetSrc = cms.InputTag( "hltSelectedPFTausTrackFindingLooseChargedIsolation" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) fragment.hltSelectedPFTau30LooseChargedIsolationL1HLTMatched = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -31946,14 +31943,16 @@ L1GtReadoutRecordTag = cms.InputTag( "hltGtStage2Digis" ) ) fragment.hltStripTrackerHVOn = cms.EDFilter( "DetectorStateFilter", - DetectorType = cms.untracked.string( "sistrip" ), DebugOn = cms.untracked.bool( False ), - DcsStatusLabel = cms.untracked.InputTag( "hltScalersRawToDigi" ) + DetectorType = cms.untracked.string( "sistrip" ), + DcsStatusLabel = cms.untracked.InputTag( "hltScalersRawToDigi" ), + DCSRecordLabel = cms.untracked.InputTag( "onlineMetaDataDigis" ) ) fragment.hltPixelTrackerHVOn = cms.EDFilter( "DetectorStateFilter", - DetectorType = cms.untracked.string( "pixel" ), DebugOn = cms.untracked.bool( False ), - DcsStatusLabel = cms.untracked.InputTag( "hltScalersRawToDigi" ) + DetectorType = cms.untracked.string( "pixel" ), + DcsStatusLabel = cms.untracked.InputTag( "hltScalersRawToDigi" ), + DCSRecordLabel = cms.untracked.InputTag( "onlineMetaDataDigis" ) ) fragment.hltHpsTauPFJetsRecoTauChargedHadronsWithNeutrals = cms.EDProducer( "PFRecoTauChargedHadronProducer", ranking = cms.VPSet( @@ -32704,7 +32703,9 @@ fragment.hltHpsL1JetsHLTPFTauTrackLooseChargedIsolationMatch = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sBigORLooseIsoEGXXerIsoTauYYerdRMin0p3" ), JetSrc = cms.InputTag( "hltHpsSelectedPFTausTrackFindingLooseChargedIsolation" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) fragment.hltHpsSelectedPFTau30LooseChargedIsolationL1HLTMatched = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -32973,7 +32974,9 @@ fragment.hltHpsL1JetsHLTPFTauTrackMediumChargedIsolationMatch = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sBigORLooseIsoEGXXerIsoTauYYerdRMin0p3" ), JetSrc = cms.InputTag( "hltHpsSelectedPFTausTrackFindingMediumChargedIsolation" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) fragment.hltHpsSelectedPFTau30MediumChargedIsolationL1HLTMatched = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -33242,7 +33245,9 @@ fragment.hltHpsL1JetsHLTPFTauTrackTightChargedIsolationMatch = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sBigORLooseIsoEGXXerIsoTauYYerdRMin0p3" ), JetSrc = cms.InputTag( "hltHpsSelectedPFTausTrackFindingTightChargedIsolation" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) fragment.hltHpsSelectedPFTau30TightChargedIsolationL1HLTMatched = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -33405,7 +33410,9 @@ fragment.hltHpsL1JetsHLTPFTauTrackLooseChargedIsolationTightOOSCPhotonsMatch = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sBigORLooseIsoEGXXerIsoTauYYerdRMin0p3" ), JetSrc = cms.InputTag( "hltHpsSelectedPFTausTrackFindingLooseChargedIsolationTightOOSCPhotons" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) fragment.hltHpsSelectedPFTau30LooseChargedIsolationTightOOSCPhotonsL1HLTMatched = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -33475,7 +33482,9 @@ fragment.hltHpsL1JetsHLTPFTauTrackMediumChargedIsolationTightOOSCPhotonsMatch = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sBigORLooseIsoEGXXerIsoTauYYerdRMin0p3" ), JetSrc = cms.InputTag( "hltHpsSelectedPFTausTrackFindingMediumChargedIsolationTightOOSCPhotons" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) fragment.hltHpsSelectedPFTau30MediumChargedIsolationTightOOSCPhotonsL1HLTMatched = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -33545,7 +33554,9 @@ fragment.hltHpsL1JetsHLTPFTauTrackTightChargedIsolationTightOOSCPhotonsMatch = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sBigORLooseIsoEGXXerIsoTauYYerdRMin0p3" ), JetSrc = cms.InputTag( "hltHpsSelectedPFTausTrackFindingTightChargedIsolationTightOOSCPhotons" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) fragment.hltHpsSelectedPFTau30TightChargedIsolationTightOOSCPhotonsL1HLTMatched = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -34471,7 +34482,9 @@ fragment.hltL1JetsHLTPFTauTrackLooseChargedIsolationAgainstMuonMatch = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sBigORMu18erTauXXer2p1" ), JetSrc = cms.InputTag( "hltSelectedPFTausTrackFindingLooseChargedIsolationAgainstMuon" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) fragment.hltSelectedPFTau27LooseChargedIsolationAgainstMuonL1HLTMatched = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -34597,7 +34610,9 @@ fragment.hltHpsL1JetsHLTPFTauTrackLooseChargedIsolationAgainstMuonMatch = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sBigORMu18erTauXXer2p1" ), JetSrc = cms.InputTag( "hltHpsSelectedPFTausTrackFindingLooseChargedIsolationAgainstMuon" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) fragment.hltHpsSelectedPFTau27LooseChargedIsolationAgainstMuonL1HLTMatched = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -34679,7 +34694,9 @@ fragment.hltHpsL1JetsHLTPFTauTrackMediumChargedIsolationAgainstMuonMatch = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sBigORMu18erTauXXer2p1" ), JetSrc = cms.InputTag( "hltHpsSelectedPFTausTrackFindingMediumChargedIsolationAgainstMuon" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) fragment.hltHpsSelectedPFTau27MediumChargedIsolationAgainstMuonL1HLTMatched = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -34761,7 +34778,9 @@ fragment.hltHpsL1JetsHLTPFTauTrackTightChargedIsolationAgainstMuonMatch = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sBigORMu18erTauXXer2p1" ), JetSrc = cms.InputTag( "hltHpsSelectedPFTausTrackFindingTightChargedIsolationAgainstMuon" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) fragment.hltHpsSelectedPFTau27TightChargedIsolationAgainstMuonL1HLTMatched = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -34834,7 +34853,9 @@ fragment.hltHpsL1JetsHLTPFTauTrackLooseChargedIsolationTightOOSCPhotonsAgainstMuonMatch = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sBigORMu18erTauXXer2p1" ), JetSrc = cms.InputTag( "hltHpsSelectedPFTausTrackFindingLooseChargedIsolationTightOOSCPhotonsAgainstMuon" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) fragment.hltHpsSelectedPFTau27LooseChargedIsolationTightOOSCPhotonsAgainstMuonL1HLTMatched = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -34907,7 +34928,9 @@ fragment.hltHpsL1JetsHLTPFTauTrackMediumChargedIsolationTightOOSCPhotonsAgainstMuonMatch = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sBigORMu18erTauXXer2p1" ), JetSrc = cms.InputTag( "hltHpsSelectedPFTausTrackFindingMediumChargedIsolationTightOOSCPhotonsAgainstMuon" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) fragment.hltHpsSelectedPFTau27MediumChargedIsolationTightOOSCPhotonsAgainstMuonL1HLTMatched = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -34980,7 +35003,9 @@ fragment.hltHpsL1JetsHLTPFTauTrackTightChargedIsolationTightOOSCPhotonsAgainstMuonMatch = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sBigORMu18erTauXXer2p1" ), JetSrc = cms.InputTag( "hltHpsSelectedPFTausTrackFindingTightChargedIsolationTightOOSCPhotonsAgainstMuon" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) fragment.hltHpsSelectedPFTau27TightChargedIsolationTightOOSCPhotonsAgainstMuonL1HLTMatched = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -37684,7 +37709,9 @@ fragment.hltL1JetsHLTPFTauTrackPt1MediumChargedIsolationMatchReg = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sBigOrMuXXerIsoTauYYer" ), JetSrc = cms.InputTag( "hltSelectedPFTausTrackPt1MediumChargedIsolationReg" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) fragment.hltSelectedPFTau35TrackPt1MediumChargedIsolationL1HLTMatchedReg = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -37848,7 +37875,9 @@ fragment.hltL1JetsHLTPFTauTrackPt1MediumChargedIsolationAndTightOOSCPhotonsMatchReg = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sBigOrMuXXerIsoTauYYer" ), JetSrc = cms.InputTag( "hltSelectedPFTausTrackPt1MediumChargedIsolationAndTightOOSCPhotonsReg" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) fragment.hltSelectedPFTau35TrackPt1MediumChargedIsolationAndTightOOSCPhotonsL1HLTMatchedReg = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -38105,7 +38134,9 @@ fragment.hltL1JetsHLTPFTauTrackPt1TightChargedIsolationMatchReg = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sBigOrMuXXerIsoTauYYer" ), JetSrc = cms.InputTag( "hltSelectedPFTausTrackPt1TightChargedIsolationReg" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) fragment.hltSelectedPFTau35TrackPt1TightChargedIsolationL1HLTMatchedReg = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -38176,7 +38207,9 @@ fragment.hltL1JetsHLTPFTauTrackPt1TightChargedIsolationAndTightOOSCPhotonsMatchReg = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sBigOrMuXXerIsoTauYYer" ), JetSrc = cms.InputTag( "hltSelectedPFTausTrackPt1TightChargedIsolationAndTightOOSCPhotonsReg" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) fragment.hltSelectedPFTau35TrackPt1TightChargedIsolationAndTightOOSCPhotonsL1HLTMatchedReg = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -38968,7 +39001,9 @@ fragment.hltHpsL1JetsHLTPFTauTrackPt1TightChargedIsolationMatchReg = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sBigOrMuXXerIsoTauYYer" ), JetSrc = cms.InputTag( "hltHpsSelectedPFTausTrackPt1TightChargedIsolationReg" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) fragment.hltHpsSelectedPFTau35TrackPt1TightChargedIsolationL1HLTMatchedReg = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -39334,7 +39369,9 @@ fragment.hltHpsL1JetsHLTPFTauTrackPt1MediumChargedIsolationAndTightOOSCPhotonsMatchReg = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sBigOrMuXXerIsoTauYYer" ), JetSrc = cms.InputTag( "hltHpsSelectedPFTausTrackPt1MediumChargedIsolationAndTightOOSCPhotonsReg" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) fragment.hltHpsSelectedPFTau35TrackPt1MediumChargedIsolationAndTightOOSCPhotonsL1HLTMatchedReg = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -39405,7 +39442,9 @@ fragment.hltHpsL1JetsHLTPFTauTrackPt1TightChargedIsolationAndTightOOSCPhotonsMatchReg = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sBigOrMuXXerIsoTauYYer" ), JetSrc = cms.InputTag( "hltHpsSelectedPFTausTrackPt1TightChargedIsolationAndTightOOSCPhotonsReg" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) fragment.hltHpsSelectedPFTau35TrackPt1TightChargedIsolationAndTightOOSCPhotonsL1HLTMatchedReg = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -39460,7 +39499,9 @@ fragment.hltHpsL1JetsHLTPFTauTrackPt1MediumChargedIsolationMatchReg = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sBigOrMuXXerIsoTauYYer" ), JetSrc = cms.InputTag( "hltHpsSelectedPFTausTrackPt1MediumChargedIsolationReg" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) fragment.hltHpsSelectedPFTau35TrackPt1MediumChargedIsolationL1HLTMatchedReg = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -39662,7 +39703,9 @@ fragment.hltHpsL1JetsHLTPFTauTrackPt1MediumChargedIsolationMatchForMu22Tau28Reg = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sMu22erIsoTau28er" ), JetSrc = cms.InputTag( "hltHpsSelectedPFTausTrackPt1MediumChargedIsolationReg" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) fragment.hltHpsSelectedPFTau30TrackPt1MediumChargedIsolationL1HLTMatchedReg = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -77275,6 +77318,22 @@ applyWeight = cms.bool( False ), srcWeights = cms.InputTag( "" ) ) +fragment.hltEgammaEleGsfTrackIsoPixelOnly = cms.EDProducer( "EgammaHLTElectronTrackIsolationProducers", + electronProducer = cms.InputTag( "hltEgammaGsfElectrons" ), + trackProducer = cms.InputTag( "hltPixelTracksZetaClean" ), + recoEcalCandidateProducer = cms.InputTag( "hltEgammaCandidates" ), + beamSpotProducer = cms.InputTag( "hltOnlineBeamSpot" ), + egTrkIsoPtMin = cms.double( 1.0 ), + egTrkIsoConeSize = cms.double( 0.2 ), + egTrkIsoZSpan = cms.double( 0.15 ), + egTrkIsoRSpan = cms.double( 999999.0 ), + egTrkIsoVetoConeSizeBarrel = cms.double( 0.03 ), + egTrkIsoVetoConeSizeEndcap = cms.double( 0.03 ), + egTrkIsoStripBarrel = cms.double( 0.01 ), + egTrkIsoStripEndcap = cms.double( 0.01 ), + useGsfTrack = cms.bool( True ), + useSCRefs = cms.bool( True ) +) fragment.hltDisplacedmumuVtxNoMatchingProducer = cms.EDProducer( "HLTDisplacedmumuVtxProducer", Src = cms.InputTag( "hltIterL3MuonCandidatesNoVtx" ), PreviousCandTag = cms.InputTag( "hltDoubleMu3L3FilteredNoVtx" ), @@ -81970,7 +82029,9 @@ fragment.hltL1JetsHLTPFTau50Track30MediumChargedIsolationMatchMu22IsoTau40 = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sMu22erIsoTau40er" ), JetSrc = cms.InputTag( "hltSelectedPFTausTrackPt30MediumAbsOrRelIsolation1Prong" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) fragment.hltSelectedPFTau50MediumChargedIsolationL1HLTMatchedMu22IsoTau40 = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -82002,7 +82063,9 @@ fragment.hltL1JetsHLTPFTau50Track30MediumChargedIsolationMatch = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sIsoTau40erETMHF90To120" ), JetSrc = cms.InputTag( "hltSelectedPFTausTrackPt30MediumAbsOrRelIsolation1Prong" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) fragment.hltSelectedPFTau50MediumChargedIsolationL1HLTMatched = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -82078,7 +82141,9 @@ fragment.hltL1JetsHLTPFTau50Track30MediumChargedIsolationMatchQuadJetIsoTau = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sQuadJet36IsoTau52" ), JetSrc = cms.InputTag( "hltSelectedPFTausTrackPt30MediumAbsOrRelIsolation1Prong" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) fragment.hltSelectedPFTau50MediumChargedIsolationL1HLTMatchedQuadIsoTau = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -82383,7 +82448,9 @@ fragment.hltL1JetsHLTPFTauTrackMediumChargedIsolationMatch1Prong = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sSingleTau" ), JetSrc = cms.InputTag( "hltSelectedPFTausTrackPt50AbsOrRelMediumHighPtRelaxedIsoIsolation1Prong" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) fragment.hltSelectedPFTau180MediumChargedIsolationL1HLTMatched1Prong = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -82416,7 +82483,9 @@ fragment.hltL1JetsHLTSinglePFTauTrackMediumChargedIsolationMatch = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sSingleTau" ), JetSrc = cms.InputTag( "hltSelectedPFTausTrackPt50AbsOrRelMediumHighPtRelaxedIsoIsolation" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) fragment.hltSelectedPFTau180MediumChargedIsolationL1HLTMatched = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -83264,7 +83333,9 @@ fragment.hltL1JetsHLTDoublePFTauTrackPt1MediumChargedIsolationMatchReg = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sDoubleTauBigOR" ), JetSrc = cms.InputTag( "hltSelectedPFTausTrackPt1MediumChargedIsolationReg" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) fragment.hltDoublePFTau35TrackPt1MediumChargedIsolationL1HLTMatchedReg = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -83306,7 +83377,9 @@ fragment.hltL1JetsHLTDoublePFTauTrackPt1MediumChargedIsolationAndTightOOSCPhotonsMatchReg = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sDoubleTauBigOR" ), JetSrc = cms.InputTag( "hltSelectedPFTausTrackPt1MediumChargedIsolationAndTightOOSCPhotonsReg" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) fragment.hltDoublePFTau35TrackPt1MediumChargedIsolationAndTightOOSCPhotonsL1HLTMatchedReg = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -83348,7 +83421,9 @@ fragment.hltL1JetsHLTDoublePFTauTrackPt1TightChargedIsolationMatchReg = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sDoubleTauBigOR" ), JetSrc = cms.InputTag( "hltSelectedPFTausTrackPt1TightChargedIsolationReg" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) fragment.hltDoublePFTau35TrackPt1TightChargedIsolationL1HLTMatchedReg = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -83390,7 +83465,9 @@ fragment.hltL1JetsHLTDoublePFTauTrackPt1TightChargedIsolationAndTightOOSCPhotonsMatchReg = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sDoubleTauBigOR" ), JetSrc = cms.InputTag( "hltSelectedPFTausTrackPt1TightChargedIsolationAndTightOOSCPhotonsReg" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) fragment.hltDoublePFTau35TrackPt1TightChargedIsolationAndTightOOSCPhotonsL1HLTMatchedReg = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -83467,7 +83544,9 @@ fragment.hltHpsL1JetsHLTDoublePFTau30TrackPt1MediumChargedIsolationMatchReg = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sDoubleTauMaxMass" ), JetSrc = cms.InputTag( "hltHpsSelectedPFTausTrackPt1MediumChargedIsolationReg" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) fragment.hltHpsDoublePFTau30TrackPt1MediumChargedIsolationL1HLTMatchedReg = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -83533,7 +83612,9 @@ fragment.hltHpsL1JetsHLTDoublePFTauTrackPt1TightChargedIsolationMatchReg = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sDoubleTauBigOR" ), JetSrc = cms.InputTag( "hltHpsSelectedPFTausTrackPt1TightChargedIsolationReg" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) fragment.hltHpsDoublePFTau35TrackPt1TightChargedIsolationL1HLTMatchedReg = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -83575,7 +83656,9 @@ fragment.hltHpsL1JetsHLTDoublePFTauTrackPt1MediumChargedIsolationAndTightOOSCPhotonsMatchReg = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sDoubleTauBigOR" ), JetSrc = cms.InputTag( "hltHpsSelectedPFTausTrackPt1MediumChargedIsolationAndTightOOSCPhotonsReg" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) fragment.hltHpsDoublePFTau35TrackPt1MediumChargedIsolationAndTightOOSCPhotonsL1HLTMatchedReg = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -83617,7 +83700,9 @@ fragment.hltHpsL1JetsHLTDoublePFTauTrackPt1MediumChargedIsolationMatchReg = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sDoubleTauBigOR" ), JetSrc = cms.InputTag( "hltHpsSelectedPFTausTrackPt1MediumChargedIsolationReg" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) fragment.hltHpsDoublePFTau35TrackPt1MediumChargedIsolationL1HLTMatchedReg = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -83659,7 +83744,9 @@ fragment.hltHpsL1JetsHLTDoublePFTauTrackPt1TightChargedIsolationAndTightOOSCPhotonsMatchReg = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sDoubleTauBigOR" ), JetSrc = cms.InputTag( "hltHpsSelectedPFTausTrackPt1TightChargedIsolationAndTightOOSCPhotonsReg" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) fragment.hltHpsDoublePFTau35TrackPt1TightChargedIsolationAndTightOOSCPhotonsL1HLTMatchedReg = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -88386,7 +88473,7 @@ fedList = cms.vuint32( 1404 ) ) fragment.hltScoutingPFPacker = cms.EDProducer( "HLTScoutingPFProducer", - pfJetCollection = cms.InputTag( "hltAK4PixelOnlyPFJets" ), + pfJetCollection = cms.InputTag( 'hltAK4PixelOnlyPFJets','','@currentProcess' ), pfJetTagCollection = cms.InputTag( 'hltCombinedSecondaryVertexBJetTagsPF','','@currentProcess' ), pfCandidateCollection = cms.InputTag( 'hltPixelOnlyParticleFlow','','@currentProcess' ), vertexCollection = cms.InputTag( 'hltPixelVertices','','@currentProcess' ), @@ -88396,20 +88483,20 @@ pfJetEtaCut = cms.double( 3.0 ), pfCandidatePtCut = cms.double( 0.6 ), pfCandidateEtaCut = cms.double( 3.0 ), - mantissaPrecision = cms.int32( 23 ), + mantissaPrecision = cms.int32( 10 ), doJetTags = cms.bool( True ), doCandidates = cms.bool( True ), doMet = cms.bool( True ) ) fragment.hltScoutingMuonPacker = cms.EDProducer( "HLTScoutingMuonProducer", - ChargedCandidates = cms.InputTag( 'hltIterL3MuonCandidatesScoutingNoVtx','','@currentProcess' ), + ChargedCandidates = cms.InputTag( 'hltIterL3MuonCandidatesNoVtx','','@currentProcess' ), displacedvertexCollection = cms.InputTag( 'hltDisplacedmumuVtxNoMatchingProducer','','@currentProcess' ), - InputMuons = cms.InputTag( "hltIterL3MuonsScoutingNoVtx" ), - InputLinks = cms.InputTag( 'hltL3MuonsIterL3LinksScoutingNoVtx','','@currentProcess' ), - Tracks = cms.InputTag( "hltIterL3MuonAndMuonFromL1MergedScoutingNoVtx" ), - EcalPFClusterIsoMap = cms.InputTag( 'hltMuonEcalMFPFClusterIsoForMuonsScoutingNoVtx','','@currentProcess' ), - HcalPFClusterIsoMap = cms.InputTag( 'hltMuonHcalPFClusterIsoForMuonsScoutingNoVtx','','@currentProcess' ), - TrackIsoMap = cms.InputTag( 'hltMuonTkRelIsolationCut0p09MapScoutingNoVtx','combinedRelativeIsoDeposits','@currentProcess' ), + InputMuons = cms.InputTag( "hltIterL3MuonsNoVtx" ), + InputLinks = cms.InputTag( 'hltL3MuonsIterL3LinksNoVtx','','@currentProcess' ), + Tracks = cms.InputTag( "hltIterL3MuonAndMuonFromL1MergedNoVtx" ), + EcalPFClusterIsoMap = cms.InputTag( 'hltMuonEcalMFPFClusterIsoForMuonsNoVtx','','@currentProcess' ), + HcalPFClusterIsoMap = cms.InputTag( 'hltMuonHcalPFClusterIsoForMuonsNoVtx','','@currentProcess' ), + TrackIsoMap = cms.InputTag( 'hltMuonTkRelIsolationCut0p09MapNoVtx','combinedRelativeIsoDeposits','@currentProcess' ), muonPtCut = cms.double( 0.0 ), muonEtaCut = cms.double( 2.4 ), minVtxProbCut = cms.double( 0.001 ) @@ -88425,7 +88512,7 @@ MissingHitsMap = cms.InputTag( 'hltEgammaGsfTrackVars','MissingHits','@currentProcess' ), OneOEMinusOneOPMap = cms.InputTag( 'hltEgammaGsfTrackVars','OneOESuperMinusOneOP','@currentProcess' ), EcalPFClusterIsoMap = cms.InputTag( 'hltEgammaEcalPFClusterIso','','@currentProcess' ), - EleGsfTrackIsoMap = cms.InputTag( 'hltEgammaEleGsfTrackIso','','@currentProcess' ), + EleGsfTrackIsoMap = cms.InputTag( 'hltEgammaEleGsfTrackIsoPixelOnly','','@currentProcess' ), HcalPFClusterIsoMap = cms.InputTag( 'hltEgammaHcalPFClusterIso','','@currentProcess' ), egammaPtCut = cms.double( 2.0 ), egammaEtaCut = cms.double( 2.5 ), @@ -88893,7 +88980,9 @@ fragment.HLTAK4PixelOnlyPFJetsCorrectionSequence = cms.Sequence( fragment.hltFixedGridRhoFastjetPixelOnlyAll + fragment.HLTAK4PixelOnlyPFCorrectorProducersSequence + fragment.hltAK4PixelOnlyPFJetsCorrected + fragment.hltAK4PixelOnlyPFJetsLooseIDCorrected + fragment.hltAK4PixelOnlyPFJetsTightIDCorrected ) fragment.HLTAK4PixelOnlyPFJetsSequence = cms.Sequence( fragment.HLTPreAK4PFJetsRecoSequence + fragment.HLTAK4PixelOnlyPFJetsReconstructionSequence + fragment.HLTAK4PixelOnlyPFJetsCorrectionSequence ) fragment.HLTMuIsolationSequence = cms.Sequence( fragment.HLTL3muonEcalPFisorecoSequenceNoBoolsForMuons + fragment.HLTL3muonHcalPFisorecoSequenceNoBoolsForMuons + fragment.HLTTrackReconstructionForIsoL3MuonIter02 + fragment.hltMuonTkRelIsolationCut0p07Map ) -fragment.HLTPixelOnlyPFScoutingSequence = cms.Sequence( fragment.HLTAK4PixelOnlyPFJetsSequence + fragment.hltPixelOnlyPFMETProducer + fragment.HLTMuIsolationSequence + fragment.HLTDoFullUnpackingEgammaEcalSequence + fragment.HLTPFClusteringForEgamma + fragment.hltEgammaCandidates + fragment.hltEgammaClusterShape + fragment.HLTDoLocalHcalSequence + fragment.HLTFastJetForEgamma + fragment.hltEgammaHoverE + fragment.hltEgammaEcalPFClusterIso + fragment.HLTPFHcalClustering + fragment.hltEgammaHcalPFClusterIso + fragment.HLTElePixelMatchSequence + fragment.HLTGsfElectronSequence + fragment.HLTTrackReconstructionForIsoElectronIter02 + fragment.hltEgammaEleGsfTrackIso ) +fragment.HLTTrackReconstructionForPixelOnlyPFNoMu = cms.Sequence( fragment.HLTDoLocalPixelSequence + fragment.HLTRecopixelvertexingSequence ) +fragment.HLTTrackReconstructionForIsoElectronPixelOnly = cms.Sequence( fragment.HLTPreAK4PFJetsRecoSequence + fragment.HLTTrackReconstructionForPixelOnlyPFNoMu + fragment.hltPixelTracksZetaClean ) +fragment.HLTPixelOnlyPFScoutingSequence = cms.Sequence( fragment.HLTAK4PixelOnlyPFJetsSequence + fragment.hltPixelOnlyPFMETProducer + fragment.HLTMuIsolationSequence + fragment.HLTDoFullUnpackingEgammaEcalSequence + fragment.HLTPFClusteringForEgamma + fragment.hltEgammaCandidates + fragment.hltEgammaClusterShape + fragment.HLTDoLocalHcalSequence + fragment.HLTFastJetForEgamma + fragment.hltEgammaHoverE + fragment.hltEgammaEcalPFClusterIso + fragment.HLTPFHcalClustering + fragment.hltEgammaHcalPFClusterIso + fragment.HLTElePixelMatchSequence + fragment.HLTGsfElectronSequence + fragment.HLTTrackReconstructionForIsoElectronPixelOnly + fragment.hltEgammaEleGsfTrackIsoPixelOnly ) fragment.HLTPFClusteringEcalMFForMuonsNoVtx = cms.Sequence( fragment.hltRecHitInRegionForMuonsMFnoVtx + fragment.hltRecHitInRegionForMuonsESNoVtx + fragment.hltParticleFlowRecHitECALForMuonsMFNoVtx + fragment.hltParticleFlowRecHitPSForMuonsNoVtx + fragment.hltParticleFlowClusterECALUncorrectedForMuonsMFNoVtx + fragment.hltParticleFlowClusterPSForMuonsNoVtx + fragment.hltParticleFlowClusterECALForMuonsMFNoVtx ) fragment.HLTL3muonEcalPFisorecoSequenceNoBoolsForMuonsNoVtx = cms.Sequence( fragment.HLTDoFullUnpackingEgammaEcalMFSequence + fragment.HLTDoLocalHcalSequence + fragment.hltTowerMakerForECALMF + fragment.hltTowerMakerForHCAL + fragment.hltFixedGridRhoFastjetECALMFForMuons + fragment.hltFixedGridRhoFastjetHCAL + fragment.HLTPFClusteringEcalMFForMuonsNoVtx + fragment.hltMuonEcalMFPFClusterIsoForMuonsNoVtx ) fragment.HLTL3muonHcalPFisorecoSequenceNoBoolsForMuonsNoVtx = cms.Sequence( fragment.HLTPFHcalClustering + fragment.hltMuonHcalPFClusterIsoForMuonsNoVtx ) diff --git a/HLTrigger/Configuration/python/HLT_HIon_cff.py b/HLTrigger/Configuration/python/HLT_HIon_cff.py index b21eef695836d..5d890036a8a65 100644 --- a/HLTrigger/Configuration/python/HLT_HIon_cff.py +++ b/HLTrigger/Configuration/python/HLT_HIon_cff.py @@ -1,13 +1,13 @@ # hltGetConfiguration --cff --data /dev/CMSSW_12_1_0/HIon --type HIon -# /dev/CMSSW_12_1_0/HIon/V10 (CMSSW_12_1_0_pre4) +# /dev/CMSSW_12_1_0/HIon/V12 (CMSSW_12_1_0_pre5) import FWCore.ParameterSet.Config as cms fragment = cms.ProcessFragment( "HLT" ) fragment.HLTConfigVersion = cms.PSet( - tableName = cms.string('/dev/CMSSW_12_1_0/HIon/V10') + tableName = cms.string('/dev/CMSSW_12_1_0/HIon/V12') ) fragment.transferSystem = cms.PSet( @@ -4559,11 +4559,6 @@ fragment.TransientTrackBuilderESProducer = cms.ESProducer( "TransientTrackBuilderESProducer", ComponentName = cms.string( "TransientTrackBuilder" ) ) -fragment.XMLIdealGeometryESSource_CTPPS = cms.ESProducer( "XMLIdealGeometryESProducer", - rootDDName = cms.string( "cms:CMSE" ), - label = cms.string( "CTPPS" ), - appendToDataLabel = cms.string( "XMLIdealGeometryESSource_CTPPS" ) -) fragment.caloDetIdAssociator = cms.ESProducer( "DetIdAssociatorESProducer", ComponentName = cms.string( "CaloDetIdAssociator" ), etaBinSize = cms.double( 0.087 ), @@ -4583,8 +4578,8 @@ buildMisalignedGeometry = cms.bool( False ), isRun2 = cms.bool( False ), dbTag = cms.string( "" ), - compactViewTag = cms.string( "XMLIdealGeometryESSource_CTPPS" ), - fromPreprocessedDB = cms.untracked.bool( False ), + compactViewTag = cms.string( "" ), + fromPreprocessedDB = cms.untracked.bool( True ), fromDD4hep = cms.untracked.bool( False ), appendToDataLabel = cms.string( "" ) ) diff --git a/HLTrigger/Configuration/python/HLT_PIon_cff.py b/HLTrigger/Configuration/python/HLT_PIon_cff.py index 71ac16dfbdaa3..63bacfb6e8ae5 100644 --- a/HLTrigger/Configuration/python/HLT_PIon_cff.py +++ b/HLTrigger/Configuration/python/HLT_PIon_cff.py @@ -1,13 +1,13 @@ # hltGetConfiguration --cff --data /dev/CMSSW_12_1_0/PIon --type PIon -# /dev/CMSSW_12_1_0/PIon/V10 (CMSSW_12_1_0_pre4) +# /dev/CMSSW_12_1_0/PIon/V12 (CMSSW_12_1_0_pre5) import FWCore.ParameterSet.Config as cms fragment = cms.ProcessFragment( "HLT" ) fragment.HLTConfigVersion = cms.PSet( - tableName = cms.string('/dev/CMSSW_12_1_0/PIon/V10') + tableName = cms.string('/dev/CMSSW_12_1_0/PIon/V12') ) fragment.transferSystem = cms.PSet( @@ -4030,11 +4030,6 @@ fragment.TransientTrackBuilderESProducer = cms.ESProducer( "TransientTrackBuilderESProducer", ComponentName = cms.string( "TransientTrackBuilder" ) ) -fragment.XMLIdealGeometryESSource_CTPPS = cms.ESProducer( "XMLIdealGeometryESProducer", - rootDDName = cms.string( "cms:CMSE" ), - label = cms.string( "CTPPS" ), - appendToDataLabel = cms.string( "XMLIdealGeometryESSource_CTPPS" ) -) fragment.caloDetIdAssociator = cms.ESProducer( "DetIdAssociatorESProducer", ComponentName = cms.string( "CaloDetIdAssociator" ), etaBinSize = cms.double( 0.087 ), @@ -4054,8 +4049,8 @@ buildMisalignedGeometry = cms.bool( False ), isRun2 = cms.bool( False ), dbTag = cms.string( "" ), - compactViewTag = cms.string( "XMLIdealGeometryESSource_CTPPS" ), - fromPreprocessedDB = cms.untracked.bool( False ), + compactViewTag = cms.string( "" ), + fromPreprocessedDB = cms.untracked.bool( True ), fromDD4hep = cms.untracked.bool( False ), appendToDataLabel = cms.string( "" ) ) diff --git a/HLTrigger/Configuration/python/HLT_PRef_cff.py b/HLTrigger/Configuration/python/HLT_PRef_cff.py index 11bf0680bceea..a336f6af1c715 100644 --- a/HLTrigger/Configuration/python/HLT_PRef_cff.py +++ b/HLTrigger/Configuration/python/HLT_PRef_cff.py @@ -1,13 +1,13 @@ # hltGetConfiguration --cff --data /dev/CMSSW_12_1_0/PRef --type PRef -# /dev/CMSSW_12_1_0/PRef/V10 (CMSSW_12_1_0_pre4) +# /dev/CMSSW_12_1_0/PRef/V12 (CMSSW_12_1_0_pre5) import FWCore.ParameterSet.Config as cms fragment = cms.ProcessFragment( "HLT" ) fragment.HLTConfigVersion = cms.PSet( - tableName = cms.string('/dev/CMSSW_12_1_0/PRef/V10') + tableName = cms.string('/dev/CMSSW_12_1_0/PRef/V12') ) fragment.transferSystem = cms.PSet( @@ -4109,11 +4109,6 @@ fragment.TransientTrackBuilderESProducer = cms.ESProducer( "TransientTrackBuilderESProducer", ComponentName = cms.string( "TransientTrackBuilder" ) ) -fragment.XMLIdealGeometryESSource_CTPPS = cms.ESProducer( "XMLIdealGeometryESProducer", - rootDDName = cms.string( "cms:CMSE" ), - label = cms.string( "CTPPS" ), - appendToDataLabel = cms.string( "XMLIdealGeometryESSource_CTPPS" ) -) fragment.caloDetIdAssociator = cms.ESProducer( "DetIdAssociatorESProducer", ComponentName = cms.string( "CaloDetIdAssociator" ), etaBinSize = cms.double( 0.087 ), @@ -4133,8 +4128,8 @@ buildMisalignedGeometry = cms.bool( False ), isRun2 = cms.bool( False ), dbTag = cms.string( "" ), - compactViewTag = cms.string( "XMLIdealGeometryESSource_CTPPS" ), - fromPreprocessedDB = cms.untracked.bool( False ), + compactViewTag = cms.string( "" ), + fromPreprocessedDB = cms.untracked.bool( True ), fromDD4hep = cms.untracked.bool( False ), appendToDataLabel = cms.string( "" ) ) @@ -11069,9 +11064,10 @@ SelectQualities = cms.vint32( ) ) fragment.hltPixelTrackerHVOn = cms.EDFilter( "DetectorStateFilter", - DetectorType = cms.untracked.string( "pixel" ), DebugOn = cms.untracked.bool( False ), - DcsStatusLabel = cms.untracked.InputTag( "hltScalersRawToDigi" ) + DetectorType = cms.untracked.string( "pixel" ), + DcsStatusLabel = cms.untracked.InputTag( "hltScalersRawToDigi" ), + DCSRecordLabel = cms.untracked.InputTag( "onlineMetaDataDigis" ) ) fragment.hltPreAlCaLumiPixelsCountsRandom = cms.EDFilter( "HLTPrescaler", offset = cms.uint32( 0 ), diff --git a/HLTrigger/Configuration/python/customizeHLTforCMSSW.py b/HLTrigger/Configuration/python/customizeHLTforCMSSW.py index 09e123bdbe85a..642a204369443 100644 --- a/HLTrigger/Configuration/python/customizeHLTforCMSSW.py +++ b/HLTrigger/Configuration/python/customizeHLTforCMSSW.py @@ -129,6 +129,9 @@ def customisePixelL1ClusterThresholdForRun2Input(process): for producer in producers_by_type(process, "SiPixelClusterProducer"): if hasattr(producer,"ClusterThreshold_L1"): producer.ClusterThreshold_L1 = 2000 + for producer in producers_by_type(process, "SiPixelRawToClusterCUDA"): + if hasattr(producer,"clusterThreshold_layer1"): + producer.clusterThreshold_layer1 = 2000 return process diff --git a/HLTrigger/Configuration/test/OnLine_HLT_FULL.py b/HLTrigger/Configuration/test/OnLine_HLT_FULL.py index 91677624de40d..0df32a467365a 100644 --- a/HLTrigger/Configuration/test/OnLine_HLT_FULL.py +++ b/HLTrigger/Configuration/test/OnLine_HLT_FULL.py @@ -1,13 +1,13 @@ # hltGetConfiguration --full --data /dev/CMSSW_12_1_0/HLT --type FULL --unprescale --process HLTFULL --globaltag auto:run3_hlt_FULL --input file:RelVal_Raw_FULL_DATA.root -# /dev/CMSSW_12_1_0/HLT/V23 (CMSSW_12_1_0_pre4) +# /dev/CMSSW_12_1_0/HLT/V27 (CMSSW_12_1_0_pre5) import FWCore.ParameterSet.Config as cms process = cms.Process( "HLTFULL" ) process.HLTConfigVersion = cms.PSet( - tableName = cms.string('/dev/CMSSW_12_1_0/HLT/V23') + tableName = cms.string('/dev/CMSSW_12_1_0/HLT/V27') ) process.transferSystem = cms.PSet( @@ -6923,11 +6923,6 @@ debugBuilder = cms.untracked.bool( False ), valueOverride = cms.int32( -1 ) ) -process.XMLIdealGeometryESSource_CTPPS = cms.ESProducer( "XMLIdealGeometryESProducer", - rootDDName = cms.string( "cms:CMSE" ), - label = cms.string( "CTPPS" ), - appendToDataLabel = cms.string( "XMLIdealGeometryESSource_CTPPS" ) -) process.ZdcGeometryFromDBEP = cms.ESProducer( "ZdcGeometryFromDBEP", applyAlignment = cms.bool( False ) ) @@ -6950,8 +6945,8 @@ buildMisalignedGeometry = cms.bool( False ), isRun2 = cms.bool( False ), dbTag = cms.string( "" ), - compactViewTag = cms.string( "XMLIdealGeometryESSource_CTPPS" ), - fromPreprocessedDB = cms.untracked.bool( False ), + compactViewTag = cms.string( "" ), + fromPreprocessedDB = cms.untracked.bool( True ), fromDD4hep = cms.untracked.bool( False ), appendToDataLabel = cms.string( "" ) ) @@ -33575,7 +33570,9 @@ process.hltL1JetsHLTPFTauTrackLooseChargedIsolationMatch = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sBigORLooseIsoEGXXerIsoTauYYerdRMin0p3" ), JetSrc = cms.InputTag( "hltSelectedPFTausTrackFindingLooseChargedIsolation" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) process.hltSelectedPFTau30LooseChargedIsolationL1HLTMatched = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -33614,14 +33611,16 @@ L1GtReadoutRecordTag = cms.InputTag( "hltGtStage2Digis" ) ) process.hltStripTrackerHVOn = cms.EDFilter( "DetectorStateFilter", - DetectorType = cms.untracked.string( "sistrip" ), DebugOn = cms.untracked.bool( False ), - DcsStatusLabel = cms.untracked.InputTag( "hltScalersRawToDigi" ) + DetectorType = cms.untracked.string( "sistrip" ), + DcsStatusLabel = cms.untracked.InputTag( "hltScalersRawToDigi" ), + DCSRecordLabel = cms.untracked.InputTag( "onlineMetaDataDigis" ) ) process.hltPixelTrackerHVOn = cms.EDFilter( "DetectorStateFilter", - DetectorType = cms.untracked.string( "pixel" ), DebugOn = cms.untracked.bool( False ), - DcsStatusLabel = cms.untracked.InputTag( "hltScalersRawToDigi" ) + DetectorType = cms.untracked.string( "pixel" ), + DcsStatusLabel = cms.untracked.InputTag( "hltScalersRawToDigi" ), + DCSRecordLabel = cms.untracked.InputTag( "onlineMetaDataDigis" ) ) process.hltHpsTauPFJetsRecoTauChargedHadronsWithNeutrals = cms.EDProducer( "PFRecoTauChargedHadronProducer", ranking = cms.VPSet( @@ -34372,7 +34371,9 @@ process.hltHpsL1JetsHLTPFTauTrackLooseChargedIsolationMatch = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sBigORLooseIsoEGXXerIsoTauYYerdRMin0p3" ), JetSrc = cms.InputTag( "hltHpsSelectedPFTausTrackFindingLooseChargedIsolation" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) process.hltHpsSelectedPFTau30LooseChargedIsolationL1HLTMatched = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -34641,7 +34642,9 @@ process.hltHpsL1JetsHLTPFTauTrackMediumChargedIsolationMatch = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sBigORLooseIsoEGXXerIsoTauYYerdRMin0p3" ), JetSrc = cms.InputTag( "hltHpsSelectedPFTausTrackFindingMediumChargedIsolation" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) process.hltHpsSelectedPFTau30MediumChargedIsolationL1HLTMatched = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -34910,7 +34913,9 @@ process.hltHpsL1JetsHLTPFTauTrackTightChargedIsolationMatch = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sBigORLooseIsoEGXXerIsoTauYYerdRMin0p3" ), JetSrc = cms.InputTag( "hltHpsSelectedPFTausTrackFindingTightChargedIsolation" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) process.hltHpsSelectedPFTau30TightChargedIsolationL1HLTMatched = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -35073,7 +35078,9 @@ process.hltHpsL1JetsHLTPFTauTrackLooseChargedIsolationTightOOSCPhotonsMatch = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sBigORLooseIsoEGXXerIsoTauYYerdRMin0p3" ), JetSrc = cms.InputTag( "hltHpsSelectedPFTausTrackFindingLooseChargedIsolationTightOOSCPhotons" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) process.hltHpsSelectedPFTau30LooseChargedIsolationTightOOSCPhotonsL1HLTMatched = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -35143,7 +35150,9 @@ process.hltHpsL1JetsHLTPFTauTrackMediumChargedIsolationTightOOSCPhotonsMatch = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sBigORLooseIsoEGXXerIsoTauYYerdRMin0p3" ), JetSrc = cms.InputTag( "hltHpsSelectedPFTausTrackFindingMediumChargedIsolationTightOOSCPhotons" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) process.hltHpsSelectedPFTau30MediumChargedIsolationTightOOSCPhotonsL1HLTMatched = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -35213,7 +35222,9 @@ process.hltHpsL1JetsHLTPFTauTrackTightChargedIsolationTightOOSCPhotonsMatch = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sBigORLooseIsoEGXXerIsoTauYYerdRMin0p3" ), JetSrc = cms.InputTag( "hltHpsSelectedPFTausTrackFindingTightChargedIsolationTightOOSCPhotons" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) process.hltHpsSelectedPFTau30TightChargedIsolationTightOOSCPhotonsL1HLTMatched = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -36163,7 +36174,9 @@ process.hltL1JetsHLTPFTauTrackLooseChargedIsolationAgainstMuonMatch = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sBigORMu18erTauXXer2p1" ), JetSrc = cms.InputTag( "hltSelectedPFTausTrackFindingLooseChargedIsolationAgainstMuon" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) process.hltSelectedPFTau27LooseChargedIsolationAgainstMuonL1HLTMatched = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -36289,7 +36302,9 @@ process.hltHpsL1JetsHLTPFTauTrackLooseChargedIsolationAgainstMuonMatch = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sBigORMu18erTauXXer2p1" ), JetSrc = cms.InputTag( "hltHpsSelectedPFTausTrackFindingLooseChargedIsolationAgainstMuon" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) process.hltHpsSelectedPFTau27LooseChargedIsolationAgainstMuonL1HLTMatched = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -36371,7 +36386,9 @@ process.hltHpsL1JetsHLTPFTauTrackMediumChargedIsolationAgainstMuonMatch = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sBigORMu18erTauXXer2p1" ), JetSrc = cms.InputTag( "hltHpsSelectedPFTausTrackFindingMediumChargedIsolationAgainstMuon" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) process.hltHpsSelectedPFTau27MediumChargedIsolationAgainstMuonL1HLTMatched = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -36453,7 +36470,9 @@ process.hltHpsL1JetsHLTPFTauTrackTightChargedIsolationAgainstMuonMatch = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sBigORMu18erTauXXer2p1" ), JetSrc = cms.InputTag( "hltHpsSelectedPFTausTrackFindingTightChargedIsolationAgainstMuon" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) process.hltHpsSelectedPFTau27TightChargedIsolationAgainstMuonL1HLTMatched = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -36526,7 +36545,9 @@ process.hltHpsL1JetsHLTPFTauTrackLooseChargedIsolationTightOOSCPhotonsAgainstMuonMatch = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sBigORMu18erTauXXer2p1" ), JetSrc = cms.InputTag( "hltHpsSelectedPFTausTrackFindingLooseChargedIsolationTightOOSCPhotonsAgainstMuon" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) process.hltHpsSelectedPFTau27LooseChargedIsolationTightOOSCPhotonsAgainstMuonL1HLTMatched = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -36599,7 +36620,9 @@ process.hltHpsL1JetsHLTPFTauTrackMediumChargedIsolationTightOOSCPhotonsAgainstMuonMatch = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sBigORMu18erTauXXer2p1" ), JetSrc = cms.InputTag( "hltHpsSelectedPFTausTrackFindingMediumChargedIsolationTightOOSCPhotonsAgainstMuon" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) process.hltHpsSelectedPFTau27MediumChargedIsolationTightOOSCPhotonsAgainstMuonL1HLTMatched = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -36672,7 +36695,9 @@ process.hltHpsL1JetsHLTPFTauTrackTightChargedIsolationTightOOSCPhotonsAgainstMuonMatch = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sBigORMu18erTauXXer2p1" ), JetSrc = cms.InputTag( "hltHpsSelectedPFTausTrackFindingTightChargedIsolationTightOOSCPhotonsAgainstMuon" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) process.hltHpsSelectedPFTau27TightChargedIsolationTightOOSCPhotonsAgainstMuonL1HLTMatched = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -39376,7 +39401,9 @@ process.hltL1JetsHLTPFTauTrackPt1MediumChargedIsolationMatchReg = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sBigOrMuXXerIsoTauYYer" ), JetSrc = cms.InputTag( "hltSelectedPFTausTrackPt1MediumChargedIsolationReg" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) process.hltSelectedPFTau35TrackPt1MediumChargedIsolationL1HLTMatchedReg = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -39540,7 +39567,9 @@ process.hltL1JetsHLTPFTauTrackPt1MediumChargedIsolationAndTightOOSCPhotonsMatchReg = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sBigOrMuXXerIsoTauYYer" ), JetSrc = cms.InputTag( "hltSelectedPFTausTrackPt1MediumChargedIsolationAndTightOOSCPhotonsReg" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) process.hltSelectedPFTau35TrackPt1MediumChargedIsolationAndTightOOSCPhotonsL1HLTMatchedReg = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -39797,7 +39826,9 @@ process.hltL1JetsHLTPFTauTrackPt1TightChargedIsolationMatchReg = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sBigOrMuXXerIsoTauYYer" ), JetSrc = cms.InputTag( "hltSelectedPFTausTrackPt1TightChargedIsolationReg" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) process.hltSelectedPFTau35TrackPt1TightChargedIsolationL1HLTMatchedReg = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -39868,7 +39899,9 @@ process.hltL1JetsHLTPFTauTrackPt1TightChargedIsolationAndTightOOSCPhotonsMatchReg = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sBigOrMuXXerIsoTauYYer" ), JetSrc = cms.InputTag( "hltSelectedPFTausTrackPt1TightChargedIsolationAndTightOOSCPhotonsReg" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) process.hltSelectedPFTau35TrackPt1TightChargedIsolationAndTightOOSCPhotonsL1HLTMatchedReg = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -40660,7 +40693,9 @@ process.hltHpsL1JetsHLTPFTauTrackPt1TightChargedIsolationMatchReg = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sBigOrMuXXerIsoTauYYer" ), JetSrc = cms.InputTag( "hltHpsSelectedPFTausTrackPt1TightChargedIsolationReg" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) process.hltHpsSelectedPFTau35TrackPt1TightChargedIsolationL1HLTMatchedReg = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -41026,7 +41061,9 @@ process.hltHpsL1JetsHLTPFTauTrackPt1MediumChargedIsolationAndTightOOSCPhotonsMatchReg = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sBigOrMuXXerIsoTauYYer" ), JetSrc = cms.InputTag( "hltHpsSelectedPFTausTrackPt1MediumChargedIsolationAndTightOOSCPhotonsReg" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) process.hltHpsSelectedPFTau35TrackPt1MediumChargedIsolationAndTightOOSCPhotonsL1HLTMatchedReg = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -41097,7 +41134,9 @@ process.hltHpsL1JetsHLTPFTauTrackPt1TightChargedIsolationAndTightOOSCPhotonsMatchReg = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sBigOrMuXXerIsoTauYYer" ), JetSrc = cms.InputTag( "hltHpsSelectedPFTausTrackPt1TightChargedIsolationAndTightOOSCPhotonsReg" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) process.hltHpsSelectedPFTau35TrackPt1TightChargedIsolationAndTightOOSCPhotonsL1HLTMatchedReg = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -41152,7 +41191,9 @@ process.hltHpsL1JetsHLTPFTauTrackPt1MediumChargedIsolationMatchReg = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sBigOrMuXXerIsoTauYYer" ), JetSrc = cms.InputTag( "hltHpsSelectedPFTausTrackPt1MediumChargedIsolationReg" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) process.hltHpsSelectedPFTau35TrackPt1MediumChargedIsolationL1HLTMatchedReg = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -41354,7 +41395,9 @@ process.hltHpsL1JetsHLTPFTauTrackPt1MediumChargedIsolationMatchForMu22Tau28Reg = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sMu22erIsoTau28er" ), JetSrc = cms.InputTag( "hltHpsSelectedPFTausTrackPt1MediumChargedIsolationReg" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) process.hltHpsSelectedPFTau30TrackPt1MediumChargedIsolationL1HLTMatchedReg = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -81342,6 +81385,22 @@ applyWeight = cms.bool( False ), srcWeights = cms.InputTag( "" ) ) +process.hltEgammaEleGsfTrackIsoPixelOnly = cms.EDProducer( "EgammaHLTElectronTrackIsolationProducers", + electronProducer = cms.InputTag( "hltEgammaGsfElectrons" ), + trackProducer = cms.InputTag( "hltPixelTracksZetaClean" ), + recoEcalCandidateProducer = cms.InputTag( "hltEgammaCandidates" ), + beamSpotProducer = cms.InputTag( "hltOnlineBeamSpot" ), + egTrkIsoPtMin = cms.double( 1.0 ), + egTrkIsoConeSize = cms.double( 0.2 ), + egTrkIsoZSpan = cms.double( 0.15 ), + egTrkIsoRSpan = cms.double( 999999.0 ), + egTrkIsoVetoConeSizeBarrel = cms.double( 0.03 ), + egTrkIsoVetoConeSizeEndcap = cms.double( 0.03 ), + egTrkIsoStripBarrel = cms.double( 0.01 ), + egTrkIsoStripEndcap = cms.double( 0.01 ), + useGsfTrack = cms.bool( True ), + useSCRefs = cms.bool( True ) +) process.hltDisplacedmumuVtxNoMatchingProducer = cms.EDProducer( "HLTDisplacedmumuVtxProducer", Src = cms.InputTag( "hltIterL3MuonCandidatesNoVtx" ), PreviousCandTag = cms.InputTag( "hltDoubleMu3L3FilteredNoVtx" ), @@ -91871,7 +91930,9 @@ process.hltL1JetsHLTPFTau50Track30MediumChargedIsolationMatchMu22IsoTau40 = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sMu22erIsoTau40er" ), JetSrc = cms.InputTag( "hltSelectedPFTausTrackPt30MediumAbsOrRelIsolation1Prong" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) process.hltSelectedPFTau50MediumChargedIsolationL1HLTMatchedMu22IsoTau40 = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -91903,7 +91964,9 @@ process.hltL1JetsHLTPFTau50Track30MediumChargedIsolationMatch = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sIsoTau40erETMHF90To120" ), JetSrc = cms.InputTag( "hltSelectedPFTausTrackPt30MediumAbsOrRelIsolation1Prong" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) process.hltSelectedPFTau50MediumChargedIsolationL1HLTMatched = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -91979,7 +92042,9 @@ process.hltL1JetsHLTPFTau50Track30MediumChargedIsolationMatchQuadJetIsoTau = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sQuadJet36IsoTau52" ), JetSrc = cms.InputTag( "hltSelectedPFTausTrackPt30MediumAbsOrRelIsolation1Prong" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) process.hltSelectedPFTau50MediumChargedIsolationL1HLTMatchedQuadIsoTau = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -92284,7 +92349,9 @@ process.hltL1JetsHLTPFTauTrackMediumChargedIsolationMatch1Prong = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sSingleTau" ), JetSrc = cms.InputTag( "hltSelectedPFTausTrackPt50AbsOrRelMediumHighPtRelaxedIsoIsolation1Prong" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) process.hltSelectedPFTau180MediumChargedIsolationL1HLTMatched1Prong = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -92317,7 +92384,9 @@ process.hltL1JetsHLTSinglePFTauTrackMediumChargedIsolationMatch = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sSingleTau" ), JetSrc = cms.InputTag( "hltSelectedPFTausTrackPt50AbsOrRelMediumHighPtRelaxedIsoIsolation" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) process.hltSelectedPFTau180MediumChargedIsolationL1HLTMatched = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -93180,7 +93249,9 @@ process.hltL1JetsHLTDoublePFTauTrackPt1MediumChargedIsolationMatchReg = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sDoubleTauBigOR" ), JetSrc = cms.InputTag( "hltSelectedPFTausTrackPt1MediumChargedIsolationReg" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) process.hltDoublePFTau35TrackPt1MediumChargedIsolationL1HLTMatchedReg = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -93222,7 +93293,9 @@ process.hltL1JetsHLTDoublePFTauTrackPt1MediumChargedIsolationAndTightOOSCPhotonsMatchReg = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sDoubleTauBigOR" ), JetSrc = cms.InputTag( "hltSelectedPFTausTrackPt1MediumChargedIsolationAndTightOOSCPhotonsReg" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) process.hltDoublePFTau35TrackPt1MediumChargedIsolationAndTightOOSCPhotonsL1HLTMatchedReg = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -93264,7 +93337,9 @@ process.hltL1JetsHLTDoublePFTauTrackPt1TightChargedIsolationMatchReg = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sDoubleTauBigOR" ), JetSrc = cms.InputTag( "hltSelectedPFTausTrackPt1TightChargedIsolationReg" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) process.hltDoublePFTau35TrackPt1TightChargedIsolationL1HLTMatchedReg = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -93306,7 +93381,9 @@ process.hltL1JetsHLTDoublePFTauTrackPt1TightChargedIsolationAndTightOOSCPhotonsMatchReg = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sDoubleTauBigOR" ), JetSrc = cms.InputTag( "hltSelectedPFTausTrackPt1TightChargedIsolationAndTightOOSCPhotonsReg" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) process.hltDoublePFTau35TrackPt1TightChargedIsolationAndTightOOSCPhotonsL1HLTMatchedReg = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -93383,7 +93460,9 @@ process.hltHpsL1JetsHLTDoublePFTau30TrackPt1MediumChargedIsolationMatchReg = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sDoubleTauMaxMass" ), JetSrc = cms.InputTag( "hltHpsSelectedPFTausTrackPt1MediumChargedIsolationReg" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) process.hltHpsDoublePFTau30TrackPt1MediumChargedIsolationL1HLTMatchedReg = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -93449,7 +93528,9 @@ process.hltHpsL1JetsHLTDoublePFTauTrackPt1TightChargedIsolationMatchReg = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sDoubleTauBigOR" ), JetSrc = cms.InputTag( "hltHpsSelectedPFTausTrackPt1TightChargedIsolationReg" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) process.hltHpsDoublePFTau35TrackPt1TightChargedIsolationL1HLTMatchedReg = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -93491,7 +93572,9 @@ process.hltHpsL1JetsHLTDoublePFTauTrackPt1MediumChargedIsolationAndTightOOSCPhotonsMatchReg = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sDoubleTauBigOR" ), JetSrc = cms.InputTag( "hltHpsSelectedPFTausTrackPt1MediumChargedIsolationAndTightOOSCPhotonsReg" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) process.hltHpsDoublePFTau35TrackPt1MediumChargedIsolationAndTightOOSCPhotonsL1HLTMatchedReg = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -93533,7 +93616,9 @@ process.hltHpsL1JetsHLTDoublePFTauTrackPt1MediumChargedIsolationMatchReg = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sDoubleTauBigOR" ), JetSrc = cms.InputTag( "hltHpsSelectedPFTausTrackPt1MediumChargedIsolationReg" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) process.hltHpsDoublePFTau35TrackPt1MediumChargedIsolationL1HLTMatchedReg = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -93575,7 +93660,9 @@ process.hltHpsL1JetsHLTDoublePFTauTrackPt1TightChargedIsolationAndTightOOSCPhotonsMatchReg = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sDoubleTauBigOR" ), JetSrc = cms.InputTag( "hltHpsSelectedPFTausTrackPt1TightChargedIsolationAndTightOOSCPhotonsReg" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) process.hltHpsDoublePFTau35TrackPt1TightChargedIsolationAndTightOOSCPhotonsL1HLTMatchedReg = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -124774,7 +124861,7 @@ fedList = cms.vuint32( 1404 ) ) process.hltScoutingPFPacker = cms.EDProducer( "HLTScoutingPFProducer", - pfJetCollection = cms.InputTag( "hltAK4PixelOnlyPFJets" ), + pfJetCollection = cms.InputTag( 'hltAK4PixelOnlyPFJets','','@currentProcess' ), pfJetTagCollection = cms.InputTag( 'hltCombinedSecondaryVertexBJetTagsPF','','@currentProcess' ), pfCandidateCollection = cms.InputTag( 'hltPixelOnlyParticleFlow','','@currentProcess' ), vertexCollection = cms.InputTag( 'hltPixelVertices','','@currentProcess' ), @@ -124784,20 +124871,20 @@ pfJetEtaCut = cms.double( 3.0 ), pfCandidatePtCut = cms.double( 0.6 ), pfCandidateEtaCut = cms.double( 3.0 ), - mantissaPrecision = cms.int32( 23 ), + mantissaPrecision = cms.int32( 10 ), doJetTags = cms.bool( True ), doCandidates = cms.bool( True ), doMet = cms.bool( True ) ) process.hltScoutingMuonPacker = cms.EDProducer( "HLTScoutingMuonProducer", - ChargedCandidates = cms.InputTag( 'hltIterL3MuonCandidatesScoutingNoVtx','','@currentProcess' ), + ChargedCandidates = cms.InputTag( 'hltIterL3MuonCandidatesNoVtx','','@currentProcess' ), displacedvertexCollection = cms.InputTag( 'hltDisplacedmumuVtxNoMatchingProducer','','@currentProcess' ), - InputMuons = cms.InputTag( "hltIterL3MuonsScoutingNoVtx" ), - InputLinks = cms.InputTag( 'hltL3MuonsIterL3LinksScoutingNoVtx','','@currentProcess' ), - Tracks = cms.InputTag( "hltIterL3MuonAndMuonFromL1MergedScoutingNoVtx" ), - EcalPFClusterIsoMap = cms.InputTag( 'hltMuonEcalMFPFClusterIsoForMuonsScoutingNoVtx','','@currentProcess' ), - HcalPFClusterIsoMap = cms.InputTag( 'hltMuonHcalPFClusterIsoForMuonsScoutingNoVtx','','@currentProcess' ), - TrackIsoMap = cms.InputTag( 'hltMuonTkRelIsolationCut0p09MapScoutingNoVtx','combinedRelativeIsoDeposits','@currentProcess' ), + InputMuons = cms.InputTag( "hltIterL3MuonsNoVtx" ), + InputLinks = cms.InputTag( 'hltL3MuonsIterL3LinksNoVtx','','@currentProcess' ), + Tracks = cms.InputTag( "hltIterL3MuonAndMuonFromL1MergedNoVtx" ), + EcalPFClusterIsoMap = cms.InputTag( 'hltMuonEcalMFPFClusterIsoForMuonsNoVtx','','@currentProcess' ), + HcalPFClusterIsoMap = cms.InputTag( 'hltMuonHcalPFClusterIsoForMuonsNoVtx','','@currentProcess' ), + TrackIsoMap = cms.InputTag( 'hltMuonTkRelIsolationCut0p09MapNoVtx','combinedRelativeIsoDeposits','@currentProcess' ), muonPtCut = cms.double( 0.0 ), muonEtaCut = cms.double( 2.4 ), minVtxProbCut = cms.double( 0.001 ) @@ -124813,7 +124900,7 @@ MissingHitsMap = cms.InputTag( 'hltEgammaGsfTrackVars','MissingHits','@currentProcess' ), OneOEMinusOneOPMap = cms.InputTag( 'hltEgammaGsfTrackVars','OneOESuperMinusOneOP','@currentProcess' ), EcalPFClusterIsoMap = cms.InputTag( 'hltEgammaEcalPFClusterIso','','@currentProcess' ), - EleGsfTrackIsoMap = cms.InputTag( 'hltEgammaEleGsfTrackIso','','@currentProcess' ), + EleGsfTrackIsoMap = cms.InputTag( 'hltEgammaEleGsfTrackIsoPixelOnly','','@currentProcess' ), HcalPFClusterIsoMap = cms.InputTag( 'hltEgammaHcalPFClusterIso','','@currentProcess' ), egammaPtCut = cms.double( 2.0 ), egammaEtaCut = cms.double( 2.5 ), @@ -130318,7 +130405,9 @@ process.HLTAK4PixelOnlyPFCorrectorProducersSequence = cms.Sequence( process.hltAK4PixelOnlyPFFastJetCorrector + process.hltAK4PixelOnlyPFRelativeCorrector + process.hltAK4PixelOnlyPFAbsoluteCorrector + process.hltAK4PixelOnlyPFResidualCorrector + process.hltAK4PixelOnlyPFCorrector ) process.HLTAK4PixelOnlyPFJetsCorrectionSequence = cms.Sequence( process.hltFixedGridRhoFastjetPixelOnlyAll + process.HLTAK4PixelOnlyPFCorrectorProducersSequence + process.hltAK4PixelOnlyPFJetsCorrected + process.hltAK4PixelOnlyPFJetsLooseIDCorrected + process.hltAK4PixelOnlyPFJetsTightIDCorrected ) process.HLTAK4PixelOnlyPFJetsSequence = cms.Sequence( process.HLTPreAK4PFJetsRecoSequence + process.HLTAK4PixelOnlyPFJetsReconstructionSequence + process.HLTAK4PixelOnlyPFJetsCorrectionSequence ) -process.HLTPixelOnlyPFScoutingSequence = cms.Sequence( process.HLTAK4PixelOnlyPFJetsSequence + process.hltPixelOnlyPFMETProducer + process.HLTMuIsolationSequence + process.HLTDoFullUnpackingEgammaEcalSequence + process.HLTPFClusteringForEgamma + process.hltEgammaCandidates + process.hltEgammaClusterShape + process.HLTDoLocalHcalSequence + process.HLTFastJetForEgamma + process.hltEgammaHoverE + process.hltEgammaEcalPFClusterIso + process.HLTPFHcalClustering + process.hltEgammaHcalPFClusterIso + process.HLTElePixelMatchSequence + process.HLTGsfElectronSequence + process.HLTTrackReconstructionForIsoElectronIter02 + process.hltEgammaEleGsfTrackIso ) +process.HLTTrackReconstructionForPixelOnlyPFNoMu = cms.Sequence( process.HLTDoLocalPixelSequence + process.HLTRecopixelvertexingSequence ) +process.HLTTrackReconstructionForIsoElectronPixelOnly = cms.Sequence( process.HLTPreAK4PFJetsRecoSequence + process.HLTTrackReconstructionForPixelOnlyPFNoMu + process.hltPixelTracksZetaClean ) +process.HLTPixelOnlyPFScoutingSequence = cms.Sequence( process.HLTAK4PixelOnlyPFJetsSequence + process.hltPixelOnlyPFMETProducer + process.HLTMuIsolationSequence + process.HLTDoFullUnpackingEgammaEcalSequence + process.HLTPFClusteringForEgamma + process.hltEgammaCandidates + process.hltEgammaClusterShape + process.HLTDoLocalHcalSequence + process.HLTFastJetForEgamma + process.hltEgammaHoverE + process.hltEgammaEcalPFClusterIso + process.HLTPFHcalClustering + process.hltEgammaHcalPFClusterIso + process.HLTElePixelMatchSequence + process.HLTGsfElectronSequence + process.HLTTrackReconstructionForIsoElectronPixelOnly + process.hltEgammaEleGsfTrackIsoPixelOnly ) process.HLTRecopixelvertexingForHighMultSequence = cms.Sequence( process.hltPixelTracksForHighMultFilter + process.hltPixelTracksForHighMultFitter + process.hltPixelTracksTrackingRegionsForHighMult + process.hltPixelLayerQuadruplets + process.hltPixelTracksHitDoubletsForHighMult + process.hltPixelTracksHitQuadrupletsForHighMult + process.hltPixelTracksForHighMult + process.hltPixelVerticesForHighMult ) process.HLTDoHIEcalClusWithCleaningSequence = cms.Sequence( process.hltIslandBasicClustersHI + process.hltHiIslandSuperClustersHI + process.hltHiCorrectedIslandBarrelSuperClustersHI + process.hltHiCorrectedIslandEndcapSuperClustersHI + process.hltCleanedHiCorrectedIslandBarrelSuperClustersHI + process.hltRecoHIEcalWithCleaningCandidate ) process.HLTPhoton20SequenceLooseHOverE = cms.Sequence( process.HLTDoFullUnpackingEgammaEcalSequence + process.HLTPFClusteringForEgamma + process.hltEgammaCandidates + process.hltEGL1SingleEG10Filter + process.hltEG20EtFilterLooseHoverE + process.HLTDoLocalHcalSequence + process.HLTFastJetForEgamma + process.hltEgammaHoverE + process.hltEG20HEFilterLooseHoverE ) diff --git a/HLTrigger/Configuration/test/OnLine_HLT_Fake.py b/HLTrigger/Configuration/test/OnLine_HLT_Fake.py index cc9717422c4e7..f56427e4683b2 100644 --- a/HLTrigger/Configuration/test/OnLine_HLT_Fake.py +++ b/HLTrigger/Configuration/test/OnLine_HLT_Fake.py @@ -1,13 +1,13 @@ # hltGetConfiguration --full --data /dev/CMSSW_12_1_0/Fake --type Fake --unprescale --process HLTFake --globaltag auto:run1_hlt_Fake --input file:RelVal_Raw_Fake_DATA.root -# /dev/CMSSW_12_1_0/Fake/V4 (CMSSW_12_1_0_pre4) +# /dev/CMSSW_12_1_0/Fake/V5 (CMSSW_12_1_0_pre5) import FWCore.ParameterSet.Config as cms process = cms.Process( "HLTFake" ) process.HLTConfigVersion = cms.PSet( - tableName = cms.string('/dev/CMSSW_12_1_0/Fake/V4') + tableName = cms.string('/dev/CMSSW_12_1_0/Fake/V5') ) process.streams = cms.PSet( A = cms.vstring( 'InitialPD' ) ) diff --git a/HLTrigger/Configuration/test/OnLine_HLT_Fake1.py b/HLTrigger/Configuration/test/OnLine_HLT_Fake1.py index 518d4f3c76642..df822ea1ec7a6 100644 --- a/HLTrigger/Configuration/test/OnLine_HLT_Fake1.py +++ b/HLTrigger/Configuration/test/OnLine_HLT_Fake1.py @@ -1,13 +1,13 @@ # hltGetConfiguration --full --data /dev/CMSSW_12_1_0/Fake1 --type Fake1 --unprescale --process HLTFake1 --globaltag auto:run2_hlt_Fake1 --input file:RelVal_Raw_Fake1_DATA.root -# /dev/CMSSW_12_1_0/Fake1/V4 (CMSSW_12_1_0_pre4) +# /dev/CMSSW_12_1_0/Fake1/V5 (CMSSW_12_1_0_pre5) import FWCore.ParameterSet.Config as cms process = cms.Process( "HLTFake1" ) process.HLTConfigVersion = cms.PSet( - tableName = cms.string('/dev/CMSSW_12_1_0/Fake1/V4') + tableName = cms.string('/dev/CMSSW_12_1_0/Fake1/V5') ) process.streams = cms.PSet( A = cms.vstring( 'InitialPD' ) ) diff --git a/HLTrigger/Configuration/test/OnLine_HLT_Fake2.py b/HLTrigger/Configuration/test/OnLine_HLT_Fake2.py index c394be6ebba57..27178eb825199 100644 --- a/HLTrigger/Configuration/test/OnLine_HLT_Fake2.py +++ b/HLTrigger/Configuration/test/OnLine_HLT_Fake2.py @@ -1,13 +1,13 @@ # hltGetConfiguration --full --data /dev/CMSSW_12_1_0/Fake2 --type Fake2 --unprescale --process HLTFake2 --globaltag auto:run2_hlt_Fake2 --input file:RelVal_Raw_Fake2_DATA.root -# /dev/CMSSW_12_1_0/Fake2/V4 (CMSSW_12_1_0_pre4) +# /dev/CMSSW_12_1_0/Fake2/V5 (CMSSW_12_1_0_pre5) import FWCore.ParameterSet.Config as cms process = cms.Process( "HLTFake2" ) process.HLTConfigVersion = cms.PSet( - tableName = cms.string('/dev/CMSSW_12_1_0/Fake2/V4') + tableName = cms.string('/dev/CMSSW_12_1_0/Fake2/V5') ) process.streams = cms.PSet( A = cms.vstring( 'InitialPD' ) ) diff --git a/HLTrigger/Configuration/test/OnLine_HLT_GRun.py b/HLTrigger/Configuration/test/OnLine_HLT_GRun.py index 2a43f131d5f6a..5a3072953a548 100644 --- a/HLTrigger/Configuration/test/OnLine_HLT_GRun.py +++ b/HLTrigger/Configuration/test/OnLine_HLT_GRun.py @@ -1,13 +1,13 @@ # hltGetConfiguration --full --data /dev/CMSSW_12_1_0/GRun --type GRun --unprescale --process HLTGRun --globaltag auto:run3_hlt_GRun --input file:RelVal_Raw_GRun_DATA.root -# /dev/CMSSW_12_1_0/GRun/V10 (CMSSW_12_1_0_pre4) +# /dev/CMSSW_12_1_0/GRun/V12 (CMSSW_12_1_0_pre5) import FWCore.ParameterSet.Config as cms process = cms.Process( "HLTGRun" ) process.HLTConfigVersion = cms.PSet( - tableName = cms.string('/dev/CMSSW_12_1_0/GRun/V10') + tableName = cms.string('/dev/CMSSW_12_1_0/GRun/V12') ) process.transferSystem = cms.PSet( @@ -5560,11 +5560,6 @@ debugBuilder = cms.untracked.bool( False ), valueOverride = cms.int32( -1 ) ) -process.XMLIdealGeometryESSource_CTPPS = cms.ESProducer( "XMLIdealGeometryESProducer", - rootDDName = cms.string( "cms:CMSE" ), - label = cms.string( "CTPPS" ), - appendToDataLabel = cms.string( "XMLIdealGeometryESSource_CTPPS" ) -) process.ZdcGeometryFromDBEP = cms.ESProducer( "ZdcGeometryFromDBEP", applyAlignment = cms.bool( False ) ) @@ -5587,8 +5582,8 @@ buildMisalignedGeometry = cms.bool( False ), isRun2 = cms.bool( False ), dbTag = cms.string( "" ), - compactViewTag = cms.string( "XMLIdealGeometryESSource_CTPPS" ), - fromPreprocessedDB = cms.untracked.bool( False ), + compactViewTag = cms.string( "" ), + fromPreprocessedDB = cms.untracked.bool( True ), fromDD4hep = cms.untracked.bool( False ), appendToDataLabel = cms.string( "" ) ) @@ -32164,7 +32159,9 @@ process.hltL1JetsHLTPFTauTrackLooseChargedIsolationMatch = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sBigORLooseIsoEGXXerIsoTauYYerdRMin0p3" ), JetSrc = cms.InputTag( "hltSelectedPFTausTrackFindingLooseChargedIsolation" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) process.hltSelectedPFTau30LooseChargedIsolationL1HLTMatched = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -32203,14 +32200,16 @@ L1GtReadoutRecordTag = cms.InputTag( "hltGtStage2Digis" ) ) process.hltStripTrackerHVOn = cms.EDFilter( "DetectorStateFilter", - DetectorType = cms.untracked.string( "sistrip" ), DebugOn = cms.untracked.bool( False ), - DcsStatusLabel = cms.untracked.InputTag( "hltScalersRawToDigi" ) + DetectorType = cms.untracked.string( "sistrip" ), + DcsStatusLabel = cms.untracked.InputTag( "hltScalersRawToDigi" ), + DCSRecordLabel = cms.untracked.InputTag( "onlineMetaDataDigis" ) ) process.hltPixelTrackerHVOn = cms.EDFilter( "DetectorStateFilter", - DetectorType = cms.untracked.string( "pixel" ), DebugOn = cms.untracked.bool( False ), - DcsStatusLabel = cms.untracked.InputTag( "hltScalersRawToDigi" ) + DetectorType = cms.untracked.string( "pixel" ), + DcsStatusLabel = cms.untracked.InputTag( "hltScalersRawToDigi" ), + DCSRecordLabel = cms.untracked.InputTag( "onlineMetaDataDigis" ) ) process.hltHpsTauPFJetsRecoTauChargedHadronsWithNeutrals = cms.EDProducer( "PFRecoTauChargedHadronProducer", ranking = cms.VPSet( @@ -32961,7 +32960,9 @@ process.hltHpsL1JetsHLTPFTauTrackLooseChargedIsolationMatch = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sBigORLooseIsoEGXXerIsoTauYYerdRMin0p3" ), JetSrc = cms.InputTag( "hltHpsSelectedPFTausTrackFindingLooseChargedIsolation" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) process.hltHpsSelectedPFTau30LooseChargedIsolationL1HLTMatched = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -33230,7 +33231,9 @@ process.hltHpsL1JetsHLTPFTauTrackMediumChargedIsolationMatch = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sBigORLooseIsoEGXXerIsoTauYYerdRMin0p3" ), JetSrc = cms.InputTag( "hltHpsSelectedPFTausTrackFindingMediumChargedIsolation" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) process.hltHpsSelectedPFTau30MediumChargedIsolationL1HLTMatched = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -33499,7 +33502,9 @@ process.hltHpsL1JetsHLTPFTauTrackTightChargedIsolationMatch = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sBigORLooseIsoEGXXerIsoTauYYerdRMin0p3" ), JetSrc = cms.InputTag( "hltHpsSelectedPFTausTrackFindingTightChargedIsolation" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) process.hltHpsSelectedPFTau30TightChargedIsolationL1HLTMatched = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -33662,7 +33667,9 @@ process.hltHpsL1JetsHLTPFTauTrackLooseChargedIsolationTightOOSCPhotonsMatch = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sBigORLooseIsoEGXXerIsoTauYYerdRMin0p3" ), JetSrc = cms.InputTag( "hltHpsSelectedPFTausTrackFindingLooseChargedIsolationTightOOSCPhotons" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) process.hltHpsSelectedPFTau30LooseChargedIsolationTightOOSCPhotonsL1HLTMatched = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -33732,7 +33739,9 @@ process.hltHpsL1JetsHLTPFTauTrackMediumChargedIsolationTightOOSCPhotonsMatch = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sBigORLooseIsoEGXXerIsoTauYYerdRMin0p3" ), JetSrc = cms.InputTag( "hltHpsSelectedPFTausTrackFindingMediumChargedIsolationTightOOSCPhotons" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) process.hltHpsSelectedPFTau30MediumChargedIsolationTightOOSCPhotonsL1HLTMatched = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -33802,7 +33811,9 @@ process.hltHpsL1JetsHLTPFTauTrackTightChargedIsolationTightOOSCPhotonsMatch = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sBigORLooseIsoEGXXerIsoTauYYerdRMin0p3" ), JetSrc = cms.InputTag( "hltHpsSelectedPFTausTrackFindingTightChargedIsolationTightOOSCPhotons" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) process.hltHpsSelectedPFTau30TightChargedIsolationTightOOSCPhotonsL1HLTMatched = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -34728,7 +34739,9 @@ process.hltL1JetsHLTPFTauTrackLooseChargedIsolationAgainstMuonMatch = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sBigORMu18erTauXXer2p1" ), JetSrc = cms.InputTag( "hltSelectedPFTausTrackFindingLooseChargedIsolationAgainstMuon" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) process.hltSelectedPFTau27LooseChargedIsolationAgainstMuonL1HLTMatched = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -34854,7 +34867,9 @@ process.hltHpsL1JetsHLTPFTauTrackLooseChargedIsolationAgainstMuonMatch = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sBigORMu18erTauXXer2p1" ), JetSrc = cms.InputTag( "hltHpsSelectedPFTausTrackFindingLooseChargedIsolationAgainstMuon" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) process.hltHpsSelectedPFTau27LooseChargedIsolationAgainstMuonL1HLTMatched = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -34936,7 +34951,9 @@ process.hltHpsL1JetsHLTPFTauTrackMediumChargedIsolationAgainstMuonMatch = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sBigORMu18erTauXXer2p1" ), JetSrc = cms.InputTag( "hltHpsSelectedPFTausTrackFindingMediumChargedIsolationAgainstMuon" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) process.hltHpsSelectedPFTau27MediumChargedIsolationAgainstMuonL1HLTMatched = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -35018,7 +35035,9 @@ process.hltHpsL1JetsHLTPFTauTrackTightChargedIsolationAgainstMuonMatch = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sBigORMu18erTauXXer2p1" ), JetSrc = cms.InputTag( "hltHpsSelectedPFTausTrackFindingTightChargedIsolationAgainstMuon" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) process.hltHpsSelectedPFTau27TightChargedIsolationAgainstMuonL1HLTMatched = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -35091,7 +35110,9 @@ process.hltHpsL1JetsHLTPFTauTrackLooseChargedIsolationTightOOSCPhotonsAgainstMuonMatch = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sBigORMu18erTauXXer2p1" ), JetSrc = cms.InputTag( "hltHpsSelectedPFTausTrackFindingLooseChargedIsolationTightOOSCPhotonsAgainstMuon" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) process.hltHpsSelectedPFTau27LooseChargedIsolationTightOOSCPhotonsAgainstMuonL1HLTMatched = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -35164,7 +35185,9 @@ process.hltHpsL1JetsHLTPFTauTrackMediumChargedIsolationTightOOSCPhotonsAgainstMuonMatch = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sBigORMu18erTauXXer2p1" ), JetSrc = cms.InputTag( "hltHpsSelectedPFTausTrackFindingMediumChargedIsolationTightOOSCPhotonsAgainstMuon" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) process.hltHpsSelectedPFTau27MediumChargedIsolationTightOOSCPhotonsAgainstMuonL1HLTMatched = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -35237,7 +35260,9 @@ process.hltHpsL1JetsHLTPFTauTrackTightChargedIsolationTightOOSCPhotonsAgainstMuonMatch = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sBigORMu18erTauXXer2p1" ), JetSrc = cms.InputTag( "hltHpsSelectedPFTausTrackFindingTightChargedIsolationTightOOSCPhotonsAgainstMuon" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) process.hltHpsSelectedPFTau27TightChargedIsolationTightOOSCPhotonsAgainstMuonL1HLTMatched = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -37941,7 +37966,9 @@ process.hltL1JetsHLTPFTauTrackPt1MediumChargedIsolationMatchReg = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sBigOrMuXXerIsoTauYYer" ), JetSrc = cms.InputTag( "hltSelectedPFTausTrackPt1MediumChargedIsolationReg" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) process.hltSelectedPFTau35TrackPt1MediumChargedIsolationL1HLTMatchedReg = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -38105,7 +38132,9 @@ process.hltL1JetsHLTPFTauTrackPt1MediumChargedIsolationAndTightOOSCPhotonsMatchReg = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sBigOrMuXXerIsoTauYYer" ), JetSrc = cms.InputTag( "hltSelectedPFTausTrackPt1MediumChargedIsolationAndTightOOSCPhotonsReg" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) process.hltSelectedPFTau35TrackPt1MediumChargedIsolationAndTightOOSCPhotonsL1HLTMatchedReg = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -38362,7 +38391,9 @@ process.hltL1JetsHLTPFTauTrackPt1TightChargedIsolationMatchReg = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sBigOrMuXXerIsoTauYYer" ), JetSrc = cms.InputTag( "hltSelectedPFTausTrackPt1TightChargedIsolationReg" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) process.hltSelectedPFTau35TrackPt1TightChargedIsolationL1HLTMatchedReg = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -38433,7 +38464,9 @@ process.hltL1JetsHLTPFTauTrackPt1TightChargedIsolationAndTightOOSCPhotonsMatchReg = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sBigOrMuXXerIsoTauYYer" ), JetSrc = cms.InputTag( "hltSelectedPFTausTrackPt1TightChargedIsolationAndTightOOSCPhotonsReg" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) process.hltSelectedPFTau35TrackPt1TightChargedIsolationAndTightOOSCPhotonsL1HLTMatchedReg = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -39225,7 +39258,9 @@ process.hltHpsL1JetsHLTPFTauTrackPt1TightChargedIsolationMatchReg = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sBigOrMuXXerIsoTauYYer" ), JetSrc = cms.InputTag( "hltHpsSelectedPFTausTrackPt1TightChargedIsolationReg" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) process.hltHpsSelectedPFTau35TrackPt1TightChargedIsolationL1HLTMatchedReg = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -39591,7 +39626,9 @@ process.hltHpsL1JetsHLTPFTauTrackPt1MediumChargedIsolationAndTightOOSCPhotonsMatchReg = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sBigOrMuXXerIsoTauYYer" ), JetSrc = cms.InputTag( "hltHpsSelectedPFTausTrackPt1MediumChargedIsolationAndTightOOSCPhotonsReg" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) process.hltHpsSelectedPFTau35TrackPt1MediumChargedIsolationAndTightOOSCPhotonsL1HLTMatchedReg = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -39662,7 +39699,9 @@ process.hltHpsL1JetsHLTPFTauTrackPt1TightChargedIsolationAndTightOOSCPhotonsMatchReg = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sBigOrMuXXerIsoTauYYer" ), JetSrc = cms.InputTag( "hltHpsSelectedPFTausTrackPt1TightChargedIsolationAndTightOOSCPhotonsReg" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) process.hltHpsSelectedPFTau35TrackPt1TightChargedIsolationAndTightOOSCPhotonsL1HLTMatchedReg = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -39717,7 +39756,9 @@ process.hltHpsL1JetsHLTPFTauTrackPt1MediumChargedIsolationMatchReg = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sBigOrMuXXerIsoTauYYer" ), JetSrc = cms.InputTag( "hltHpsSelectedPFTausTrackPt1MediumChargedIsolationReg" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) process.hltHpsSelectedPFTau35TrackPt1MediumChargedIsolationL1HLTMatchedReg = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -39919,7 +39960,9 @@ process.hltHpsL1JetsHLTPFTauTrackPt1MediumChargedIsolationMatchForMu22Tau28Reg = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sMu22erIsoTau28er" ), JetSrc = cms.InputTag( "hltHpsSelectedPFTausTrackPt1MediumChargedIsolationReg" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) process.hltHpsSelectedPFTau30TrackPt1MediumChargedIsolationL1HLTMatchedReg = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -77532,6 +77575,22 @@ applyWeight = cms.bool( False ), srcWeights = cms.InputTag( "" ) ) +process.hltEgammaEleGsfTrackIsoPixelOnly = cms.EDProducer( "EgammaHLTElectronTrackIsolationProducers", + electronProducer = cms.InputTag( "hltEgammaGsfElectrons" ), + trackProducer = cms.InputTag( "hltPixelTracksZetaClean" ), + recoEcalCandidateProducer = cms.InputTag( "hltEgammaCandidates" ), + beamSpotProducer = cms.InputTag( "hltOnlineBeamSpot" ), + egTrkIsoPtMin = cms.double( 1.0 ), + egTrkIsoConeSize = cms.double( 0.2 ), + egTrkIsoZSpan = cms.double( 0.15 ), + egTrkIsoRSpan = cms.double( 999999.0 ), + egTrkIsoVetoConeSizeBarrel = cms.double( 0.03 ), + egTrkIsoVetoConeSizeEndcap = cms.double( 0.03 ), + egTrkIsoStripBarrel = cms.double( 0.01 ), + egTrkIsoStripEndcap = cms.double( 0.01 ), + useGsfTrack = cms.bool( True ), + useSCRefs = cms.bool( True ) +) process.hltDisplacedmumuVtxNoMatchingProducer = cms.EDProducer( "HLTDisplacedmumuVtxProducer", Src = cms.InputTag( "hltIterL3MuonCandidatesNoVtx" ), PreviousCandTag = cms.InputTag( "hltDoubleMu3L3FilteredNoVtx" ), @@ -82227,7 +82286,9 @@ process.hltL1JetsHLTPFTau50Track30MediumChargedIsolationMatchMu22IsoTau40 = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sMu22erIsoTau40er" ), JetSrc = cms.InputTag( "hltSelectedPFTausTrackPt30MediumAbsOrRelIsolation1Prong" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) process.hltSelectedPFTau50MediumChargedIsolationL1HLTMatchedMu22IsoTau40 = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -82259,7 +82320,9 @@ process.hltL1JetsHLTPFTau50Track30MediumChargedIsolationMatch = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sIsoTau40erETMHF90To120" ), JetSrc = cms.InputTag( "hltSelectedPFTausTrackPt30MediumAbsOrRelIsolation1Prong" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) process.hltSelectedPFTau50MediumChargedIsolationL1HLTMatched = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -82335,7 +82398,9 @@ process.hltL1JetsHLTPFTau50Track30MediumChargedIsolationMatchQuadJetIsoTau = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sQuadJet36IsoTau52" ), JetSrc = cms.InputTag( "hltSelectedPFTausTrackPt30MediumAbsOrRelIsolation1Prong" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) process.hltSelectedPFTau50MediumChargedIsolationL1HLTMatchedQuadIsoTau = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -82640,7 +82705,9 @@ process.hltL1JetsHLTPFTauTrackMediumChargedIsolationMatch1Prong = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sSingleTau" ), JetSrc = cms.InputTag( "hltSelectedPFTausTrackPt50AbsOrRelMediumHighPtRelaxedIsoIsolation1Prong" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) process.hltSelectedPFTau180MediumChargedIsolationL1HLTMatched1Prong = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -82673,7 +82740,9 @@ process.hltL1JetsHLTSinglePFTauTrackMediumChargedIsolationMatch = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sSingleTau" ), JetSrc = cms.InputTag( "hltSelectedPFTausTrackPt50AbsOrRelMediumHighPtRelaxedIsoIsolation" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) process.hltSelectedPFTau180MediumChargedIsolationL1HLTMatched = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -83521,7 +83590,9 @@ process.hltL1JetsHLTDoublePFTauTrackPt1MediumChargedIsolationMatchReg = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sDoubleTauBigOR" ), JetSrc = cms.InputTag( "hltSelectedPFTausTrackPt1MediumChargedIsolationReg" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) process.hltDoublePFTau35TrackPt1MediumChargedIsolationL1HLTMatchedReg = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -83563,7 +83634,9 @@ process.hltL1JetsHLTDoublePFTauTrackPt1MediumChargedIsolationAndTightOOSCPhotonsMatchReg = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sDoubleTauBigOR" ), JetSrc = cms.InputTag( "hltSelectedPFTausTrackPt1MediumChargedIsolationAndTightOOSCPhotonsReg" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) process.hltDoublePFTau35TrackPt1MediumChargedIsolationAndTightOOSCPhotonsL1HLTMatchedReg = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -83605,7 +83678,9 @@ process.hltL1JetsHLTDoublePFTauTrackPt1TightChargedIsolationMatchReg = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sDoubleTauBigOR" ), JetSrc = cms.InputTag( "hltSelectedPFTausTrackPt1TightChargedIsolationReg" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) process.hltDoublePFTau35TrackPt1TightChargedIsolationL1HLTMatchedReg = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -83647,7 +83722,9 @@ process.hltL1JetsHLTDoublePFTauTrackPt1TightChargedIsolationAndTightOOSCPhotonsMatchReg = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sDoubleTauBigOR" ), JetSrc = cms.InputTag( "hltSelectedPFTausTrackPt1TightChargedIsolationAndTightOOSCPhotonsReg" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) process.hltDoublePFTau35TrackPt1TightChargedIsolationAndTightOOSCPhotonsL1HLTMatchedReg = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -83724,7 +83801,9 @@ process.hltHpsL1JetsHLTDoublePFTau30TrackPt1MediumChargedIsolationMatchReg = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sDoubleTauMaxMass" ), JetSrc = cms.InputTag( "hltHpsSelectedPFTausTrackPt1MediumChargedIsolationReg" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) process.hltHpsDoublePFTau30TrackPt1MediumChargedIsolationL1HLTMatchedReg = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -83790,7 +83869,9 @@ process.hltHpsL1JetsHLTDoublePFTauTrackPt1TightChargedIsolationMatchReg = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sDoubleTauBigOR" ), JetSrc = cms.InputTag( "hltHpsSelectedPFTausTrackPt1TightChargedIsolationReg" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) process.hltHpsDoublePFTau35TrackPt1TightChargedIsolationL1HLTMatchedReg = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -83832,7 +83913,9 @@ process.hltHpsL1JetsHLTDoublePFTauTrackPt1MediumChargedIsolationAndTightOOSCPhotonsMatchReg = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sDoubleTauBigOR" ), JetSrc = cms.InputTag( "hltHpsSelectedPFTausTrackPt1MediumChargedIsolationAndTightOOSCPhotonsReg" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) process.hltHpsDoublePFTau35TrackPt1MediumChargedIsolationAndTightOOSCPhotonsL1HLTMatchedReg = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -83874,7 +83957,9 @@ process.hltHpsL1JetsHLTDoublePFTauTrackPt1MediumChargedIsolationMatchReg = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sDoubleTauBigOR" ), JetSrc = cms.InputTag( "hltHpsSelectedPFTausTrackPt1MediumChargedIsolationReg" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) process.hltHpsDoublePFTau35TrackPt1MediumChargedIsolationL1HLTMatchedReg = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -83916,7 +84001,9 @@ process.hltHpsL1JetsHLTDoublePFTauTrackPt1TightChargedIsolationAndTightOOSCPhotonsMatchReg = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sDoubleTauBigOR" ), JetSrc = cms.InputTag( "hltHpsSelectedPFTausTrackPt1TightChargedIsolationAndTightOOSCPhotonsReg" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) process.hltHpsDoublePFTau35TrackPt1TightChargedIsolationAndTightOOSCPhotonsL1HLTMatchedReg = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -89398,7 +89485,7 @@ fedList = cms.vuint32( 1404 ) ) process.hltScoutingPFPacker = cms.EDProducer( "HLTScoutingPFProducer", - pfJetCollection = cms.InputTag( "hltAK4PixelOnlyPFJets" ), + pfJetCollection = cms.InputTag( 'hltAK4PixelOnlyPFJets','','@currentProcess' ), pfJetTagCollection = cms.InputTag( 'hltCombinedSecondaryVertexBJetTagsPF','','@currentProcess' ), pfCandidateCollection = cms.InputTag( 'hltPixelOnlyParticleFlow','','@currentProcess' ), vertexCollection = cms.InputTag( 'hltPixelVertices','','@currentProcess' ), @@ -89408,20 +89495,20 @@ pfJetEtaCut = cms.double( 3.0 ), pfCandidatePtCut = cms.double( 0.6 ), pfCandidateEtaCut = cms.double( 3.0 ), - mantissaPrecision = cms.int32( 23 ), + mantissaPrecision = cms.int32( 10 ), doJetTags = cms.bool( True ), doCandidates = cms.bool( True ), doMet = cms.bool( True ) ) process.hltScoutingMuonPacker = cms.EDProducer( "HLTScoutingMuonProducer", - ChargedCandidates = cms.InputTag( 'hltIterL3MuonCandidatesScoutingNoVtx','','@currentProcess' ), + ChargedCandidates = cms.InputTag( 'hltIterL3MuonCandidatesNoVtx','','@currentProcess' ), displacedvertexCollection = cms.InputTag( 'hltDisplacedmumuVtxNoMatchingProducer','','@currentProcess' ), - InputMuons = cms.InputTag( "hltIterL3MuonsScoutingNoVtx" ), - InputLinks = cms.InputTag( 'hltL3MuonsIterL3LinksScoutingNoVtx','','@currentProcess' ), - Tracks = cms.InputTag( "hltIterL3MuonAndMuonFromL1MergedScoutingNoVtx" ), - EcalPFClusterIsoMap = cms.InputTag( 'hltMuonEcalMFPFClusterIsoForMuonsScoutingNoVtx','','@currentProcess' ), - HcalPFClusterIsoMap = cms.InputTag( 'hltMuonHcalPFClusterIsoForMuonsScoutingNoVtx','','@currentProcess' ), - TrackIsoMap = cms.InputTag( 'hltMuonTkRelIsolationCut0p09MapScoutingNoVtx','combinedRelativeIsoDeposits','@currentProcess' ), + InputMuons = cms.InputTag( "hltIterL3MuonsNoVtx" ), + InputLinks = cms.InputTag( 'hltL3MuonsIterL3LinksNoVtx','','@currentProcess' ), + Tracks = cms.InputTag( "hltIterL3MuonAndMuonFromL1MergedNoVtx" ), + EcalPFClusterIsoMap = cms.InputTag( 'hltMuonEcalMFPFClusterIsoForMuonsNoVtx','','@currentProcess' ), + HcalPFClusterIsoMap = cms.InputTag( 'hltMuonHcalPFClusterIsoForMuonsNoVtx','','@currentProcess' ), + TrackIsoMap = cms.InputTag( 'hltMuonTkRelIsolationCut0p09MapNoVtx','combinedRelativeIsoDeposits','@currentProcess' ), muonPtCut = cms.double( 0.0 ), muonEtaCut = cms.double( 2.4 ), minVtxProbCut = cms.double( 0.001 ) @@ -89437,7 +89524,7 @@ MissingHitsMap = cms.InputTag( 'hltEgammaGsfTrackVars','MissingHits','@currentProcess' ), OneOEMinusOneOPMap = cms.InputTag( 'hltEgammaGsfTrackVars','OneOESuperMinusOneOP','@currentProcess' ), EcalPFClusterIsoMap = cms.InputTag( 'hltEgammaEcalPFClusterIso','','@currentProcess' ), - EleGsfTrackIsoMap = cms.InputTag( 'hltEgammaEleGsfTrackIso','','@currentProcess' ), + EleGsfTrackIsoMap = cms.InputTag( 'hltEgammaEleGsfTrackIsoPixelOnly','','@currentProcess' ), HcalPFClusterIsoMap = cms.InputTag( 'hltEgammaHcalPFClusterIso','','@currentProcess' ), egammaPtCut = cms.double( 2.0 ), egammaEtaCut = cms.double( 2.5 ), @@ -91853,7 +91940,9 @@ process.HLTAK4PixelOnlyPFJetsCorrectionSequence = cms.Sequence( process.hltFixedGridRhoFastjetPixelOnlyAll + process.HLTAK4PixelOnlyPFCorrectorProducersSequence + process.hltAK4PixelOnlyPFJetsCorrected + process.hltAK4PixelOnlyPFJetsLooseIDCorrected + process.hltAK4PixelOnlyPFJetsTightIDCorrected ) process.HLTAK4PixelOnlyPFJetsSequence = cms.Sequence( process.HLTPreAK4PFJetsRecoSequence + process.HLTAK4PixelOnlyPFJetsReconstructionSequence + process.HLTAK4PixelOnlyPFJetsCorrectionSequence ) process.HLTMuIsolationSequence = cms.Sequence( process.HLTL3muonEcalPFisorecoSequenceNoBoolsForMuons + process.HLTL3muonHcalPFisorecoSequenceNoBoolsForMuons + process.HLTTrackReconstructionForIsoL3MuonIter02 + process.hltMuonTkRelIsolationCut0p07Map ) -process.HLTPixelOnlyPFScoutingSequence = cms.Sequence( process.HLTAK4PixelOnlyPFJetsSequence + process.hltPixelOnlyPFMETProducer + process.HLTMuIsolationSequence + process.HLTDoFullUnpackingEgammaEcalSequence + process.HLTPFClusteringForEgamma + process.hltEgammaCandidates + process.hltEgammaClusterShape + process.HLTDoLocalHcalSequence + process.HLTFastJetForEgamma + process.hltEgammaHoverE + process.hltEgammaEcalPFClusterIso + process.HLTPFHcalClustering + process.hltEgammaHcalPFClusterIso + process.HLTElePixelMatchSequence + process.HLTGsfElectronSequence + process.HLTTrackReconstructionForIsoElectronIter02 + process.hltEgammaEleGsfTrackIso ) +process.HLTTrackReconstructionForPixelOnlyPFNoMu = cms.Sequence( process.HLTDoLocalPixelSequence + process.HLTRecopixelvertexingSequence ) +process.HLTTrackReconstructionForIsoElectronPixelOnly = cms.Sequence( process.HLTPreAK4PFJetsRecoSequence + process.HLTTrackReconstructionForPixelOnlyPFNoMu + process.hltPixelTracksZetaClean ) +process.HLTPixelOnlyPFScoutingSequence = cms.Sequence( process.HLTAK4PixelOnlyPFJetsSequence + process.hltPixelOnlyPFMETProducer + process.HLTMuIsolationSequence + process.HLTDoFullUnpackingEgammaEcalSequence + process.HLTPFClusteringForEgamma + process.hltEgammaCandidates + process.hltEgammaClusterShape + process.HLTDoLocalHcalSequence + process.HLTFastJetForEgamma + process.hltEgammaHoverE + process.hltEgammaEcalPFClusterIso + process.HLTPFHcalClustering + process.hltEgammaHcalPFClusterIso + process.HLTElePixelMatchSequence + process.HLTGsfElectronSequence + process.HLTTrackReconstructionForIsoElectronPixelOnly + process.hltEgammaEleGsfTrackIsoPixelOnly ) process.HLTPFClusteringEcalMFForMuonsNoVtx = cms.Sequence( process.hltRecHitInRegionForMuonsMFnoVtx + process.hltRecHitInRegionForMuonsESNoVtx + process.hltParticleFlowRecHitECALForMuonsMFNoVtx + process.hltParticleFlowRecHitPSForMuonsNoVtx + process.hltParticleFlowClusterECALUncorrectedForMuonsMFNoVtx + process.hltParticleFlowClusterPSForMuonsNoVtx + process.hltParticleFlowClusterECALForMuonsMFNoVtx ) process.HLTL3muonEcalPFisorecoSequenceNoBoolsForMuonsNoVtx = cms.Sequence( process.HLTDoFullUnpackingEgammaEcalMFSequence + process.HLTDoLocalHcalSequence + process.hltTowerMakerForECALMF + process.hltTowerMakerForHCAL + process.hltFixedGridRhoFastjetECALMFForMuons + process.hltFixedGridRhoFastjetHCAL + process.HLTPFClusteringEcalMFForMuonsNoVtx + process.hltMuonEcalMFPFClusterIsoForMuonsNoVtx ) process.HLTL3muonHcalPFisorecoSequenceNoBoolsForMuonsNoVtx = cms.Sequence( process.HLTPFHcalClustering + process.hltMuonHcalPFClusterIsoForMuonsNoVtx ) diff --git a/HLTrigger/Configuration/test/OnLine_HLT_HIon.py b/HLTrigger/Configuration/test/OnLine_HLT_HIon.py index 820395d30c370..e2395403a3529 100644 --- a/HLTrigger/Configuration/test/OnLine_HLT_HIon.py +++ b/HLTrigger/Configuration/test/OnLine_HLT_HIon.py @@ -1,13 +1,13 @@ # hltGetConfiguration --full --data /dev/CMSSW_12_1_0/HIon --type HIon --unprescale --process HLTHIon --globaltag auto:run3_hlt_HIon --input file:RelVal_Raw_HIon_DATA.root -# /dev/CMSSW_12_1_0/HIon/V10 (CMSSW_12_1_0_pre4) +# /dev/CMSSW_12_1_0/HIon/V12 (CMSSW_12_1_0_pre5) import FWCore.ParameterSet.Config as cms process = cms.Process( "HLTHIon" ) process.HLTConfigVersion = cms.PSet( - tableName = cms.string('/dev/CMSSW_12_1_0/HIon/V10') + tableName = cms.string('/dev/CMSSW_12_1_0/HIon/V12') ) process.transferSystem = cms.PSet( @@ -4723,11 +4723,6 @@ debugBuilder = cms.untracked.bool( False ), valueOverride = cms.int32( -1 ) ) -process.XMLIdealGeometryESSource_CTPPS = cms.ESProducer( "XMLIdealGeometryESProducer", - rootDDName = cms.string( "cms:CMSE" ), - label = cms.string( "CTPPS" ), - appendToDataLabel = cms.string( "XMLIdealGeometryESSource_CTPPS" ) -) process.ZdcGeometryFromDBEP = cms.ESProducer( "ZdcGeometryFromDBEP", applyAlignment = cms.bool( False ) ) @@ -4750,8 +4745,8 @@ buildMisalignedGeometry = cms.bool( False ), isRun2 = cms.bool( False ), dbTag = cms.string( "" ), - compactViewTag = cms.string( "XMLIdealGeometryESSource_CTPPS" ), - fromPreprocessedDB = cms.untracked.bool( False ), + compactViewTag = cms.string( "" ), + fromPreprocessedDB = cms.untracked.bool( True ), fromDD4hep = cms.untracked.bool( False ), appendToDataLabel = cms.string( "" ) ) diff --git a/HLTrigger/Configuration/test/OnLine_HLT_PIon.py b/HLTrigger/Configuration/test/OnLine_HLT_PIon.py index fff98dfde3a4e..e53952b13e866 100644 --- a/HLTrigger/Configuration/test/OnLine_HLT_PIon.py +++ b/HLTrigger/Configuration/test/OnLine_HLT_PIon.py @@ -1,13 +1,13 @@ # hltGetConfiguration --full --data /dev/CMSSW_12_1_0/PIon --type PIon --unprescale --process HLTPIon --globaltag auto:run3_hlt_PIon --input file:RelVal_Raw_PIon_DATA.root -# /dev/CMSSW_12_1_0/PIon/V10 (CMSSW_12_1_0_pre4) +# /dev/CMSSW_12_1_0/PIon/V12 (CMSSW_12_1_0_pre5) import FWCore.ParameterSet.Config as cms process = cms.Process( "HLTPIon" ) process.HLTConfigVersion = cms.PSet( - tableName = cms.string('/dev/CMSSW_12_1_0/PIon/V10') + tableName = cms.string('/dev/CMSSW_12_1_0/PIon/V12') ) process.transferSystem = cms.PSet( @@ -4194,11 +4194,6 @@ debugBuilder = cms.untracked.bool( False ), valueOverride = cms.int32( -1 ) ) -process.XMLIdealGeometryESSource_CTPPS = cms.ESProducer( "XMLIdealGeometryESProducer", - rootDDName = cms.string( "cms:CMSE" ), - label = cms.string( "CTPPS" ), - appendToDataLabel = cms.string( "XMLIdealGeometryESSource_CTPPS" ) -) process.ZdcGeometryFromDBEP = cms.ESProducer( "ZdcGeometryFromDBEP", applyAlignment = cms.bool( False ) ) @@ -4221,8 +4216,8 @@ buildMisalignedGeometry = cms.bool( False ), isRun2 = cms.bool( False ), dbTag = cms.string( "" ), - compactViewTag = cms.string( "XMLIdealGeometryESSource_CTPPS" ), - fromPreprocessedDB = cms.untracked.bool( False ), + compactViewTag = cms.string( "" ), + fromPreprocessedDB = cms.untracked.bool( True ), fromDD4hep = cms.untracked.bool( False ), appendToDataLabel = cms.string( "" ) ) diff --git a/HLTrigger/Configuration/test/OnLine_HLT_PRef.py b/HLTrigger/Configuration/test/OnLine_HLT_PRef.py index 8bf6784d45186..e4fa14890a9ba 100644 --- a/HLTrigger/Configuration/test/OnLine_HLT_PRef.py +++ b/HLTrigger/Configuration/test/OnLine_HLT_PRef.py @@ -1,13 +1,13 @@ # hltGetConfiguration --full --data /dev/CMSSW_12_1_0/PRef --type PRef --unprescale --process HLTPRef --globaltag auto:run3_hlt_PRef --input file:RelVal_Raw_PRef_DATA.root -# /dev/CMSSW_12_1_0/PRef/V10 (CMSSW_12_1_0_pre4) +# /dev/CMSSW_12_1_0/PRef/V12 (CMSSW_12_1_0_pre5) import FWCore.ParameterSet.Config as cms process = cms.Process( "HLTPRef" ) process.HLTConfigVersion = cms.PSet( - tableName = cms.string('/dev/CMSSW_12_1_0/PRef/V10') + tableName = cms.string('/dev/CMSSW_12_1_0/PRef/V12') ) process.transferSystem = cms.PSet( @@ -4273,11 +4273,6 @@ debugBuilder = cms.untracked.bool( False ), valueOverride = cms.int32( -1 ) ) -process.XMLIdealGeometryESSource_CTPPS = cms.ESProducer( "XMLIdealGeometryESProducer", - rootDDName = cms.string( "cms:CMSE" ), - label = cms.string( "CTPPS" ), - appendToDataLabel = cms.string( "XMLIdealGeometryESSource_CTPPS" ) -) process.ZdcGeometryFromDBEP = cms.ESProducer( "ZdcGeometryFromDBEP", applyAlignment = cms.bool( False ) ) @@ -4300,8 +4295,8 @@ buildMisalignedGeometry = cms.bool( False ), isRun2 = cms.bool( False ), dbTag = cms.string( "" ), - compactViewTag = cms.string( "XMLIdealGeometryESSource_CTPPS" ), - fromPreprocessedDB = cms.untracked.bool( False ), + compactViewTag = cms.string( "" ), + fromPreprocessedDB = cms.untracked.bool( True ), fromDD4hep = cms.untracked.bool( False ), appendToDataLabel = cms.string( "" ) ) @@ -11326,9 +11321,10 @@ SelectQualities = cms.vint32( ) ) process.hltPixelTrackerHVOn = cms.EDFilter( "DetectorStateFilter", - DetectorType = cms.untracked.string( "pixel" ), DebugOn = cms.untracked.bool( False ), - DcsStatusLabel = cms.untracked.InputTag( "hltScalersRawToDigi" ) + DetectorType = cms.untracked.string( "pixel" ), + DcsStatusLabel = cms.untracked.InputTag( "hltScalersRawToDigi" ), + DCSRecordLabel = cms.untracked.InputTag( "onlineMetaDataDigis" ) ) process.hltPreAlCaLumiPixelsCountsRandom = cms.EDFilter( "HLTPrescaler", offset = cms.uint32( 0 ), diff --git a/Validation/RecoTrack/python/plotting/plotting.py b/Validation/RecoTrack/python/plotting/plotting.py index 0a1c886e5270a..24e5c51258d14 100644 --- a/Validation/RecoTrack/python/plotting/plotting.py +++ b/Validation/RecoTrack/python/plotting/plotting.py @@ -49,7 +49,8 @@ def _setStyle(): def _getObject(tdirectory, name): obj = tdirectory.Get(name) if not obj: - print("Did not find {obj} from {dir}".format(obj=name, dir=tdirectory.GetPath())) + if verbose: + print("Did not find {obj} from {dir}".format(obj=name, dir=tdirectory.GetPath())) return None return obj diff --git a/Validation/RecoTrack/python/plotting/validation.py b/Validation/RecoTrack/python/plotting/validation.py index 73f98013209f0..e4c06aadbb0fb 100644 --- a/Validation/RecoTrack/python/plotting/validation.py +++ b/Validation/RecoTrack/python/plotting/validation.py @@ -1201,6 +1201,7 @@ def _doPlotsForPlotter(self, plotter, sample, limitSubFoldersOnlyTo=None): if not os.path.exists(newdir): os.makedirs(newdir, exist_ok=True) + plotterFolder.create(self._openFiles, self._labels, dqmSubFolder) p = multiprocessing.Process(target=self._doPlots, args=(plotterFolder, dqmSubFolder, newsubdir, newdir, iProc, return_dict)) proc.append((plotterFolder, dqmSubFolder, p)) p.start() @@ -1294,7 +1295,6 @@ def doPlots(self, plotters, plotterDrawArgs={}, **kwargs): self._openFiles = [] def _doPlots(self, plotterFolder, dqmSubFolder, newsubdir, newdir, iProc, return_dict): - plotterFolder.create(self._openFiles, self._labels, dqmSubFolder) fileList = plotterFolder.draw(directory=newdir, **self._plotterDrawArgs) if len(fileList) == 0: @@ -1362,7 +1362,6 @@ def doPlots(self, plotters, plotterDrawArgs={}, **kwargs): self._openFiles = [] def _doPlots(self, plotterFolder, dqmSubFolder, newsubdir, newdir, iProc, return_dict): - plotterFolder.create(self._openFiles, self._labels, dqmSubFolder) fileList = plotterFolder.draw(directory=newdir, **self._plotterDrawArgs) # check if plots are produced