Skip to content
New issue

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

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

Already on GitHub? Sign in to your account

Doublet tuning and new vertex algo #149

Closed
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
190 commits
Select commit Hold shift + click to select a range
e2ddbea
L1TStage2CaloLayer2Offline: normalised L1 vs offline histograms to bi…
kreczko Jun 25, 2018
d246b5d
clang-format of L1TTauOffline
kreczko Jun 25, 2018
20a4c83
L1TTauOffline: normalising L1 vs offline histograms to bin area
kreczko Jun 25, 2018
a20effb
L1TTauOffline: changing efficiency plots to DQMEDHarvester::DQMGeneri…
kreczko Jun 25, 2018
0713d03
L1TEGammaOffline: fixed early stopping of probe electron matching
kreczko Jun 25, 2018
e4eed9c
L1TEGammaOffline: adjusted cust for efficiency vs. eta and efficiency…
kreczko Jun 25, 2018
2ab3ca7
Merge branch 'master' into kreczko-issue-CMSLITDPG-590-part1
kreczko Jul 3, 2018
6489468
fix dz0p1 tracks selection
mtosi Jul 11, 2018
2d99f80
Ignore TDC information when computing min-bias feature bit
christopheralanwest Jul 16, 2018
977ad5c
Use more descriptive names for analyze methods
christopheralanwest Jul 17, 2018
ba4a9f2
MHT>0 and deleted Emu->Fill(data)
vukasinmilosevic Jul 23, 2018
279b72b
Added new by-lumisection plots to monitor the behavior of TTF4 flags,…
tanmaymudholkar Jul 23, 2018
4335430
enabling 2D plots for muon inner track monitoring
mtosi Jul 23, 2018
d7a7e27
apply code-checks
mtosi Jul 23, 2018
26404fb
fix
mtosi Jul 23, 2018
f702663
Properly configure TDC cuts in min-bias bits
christopheralanwest Jul 24, 2018
7f75c95
Modified CaloL1 Trigger DQM to allow for second hf feature bit withou…
Jul 26, 2018
64f32d7
Produce CPPFDigis from EMTF unpacker and emulator
abrinke1 May 11, 2018
db034c5
EMTF fix CPPF unpacking bug, apply zero-suppression
abrinke1 Jun 14, 2018
e9cfd14
Emulate EMTF from unpacked CPPF digis, small unpacker fixes
abrinke1 Jun 15, 2018
067814a
EMTF emulation from unpacked CPPF, changes suggested by Jia Fu
abrinke1 Jun 15, 2018
fa265c7
EMTF emulator apply code style fix
abrinke1 Jul 5, 2018
9702f95
Use EMTF data re-emulation config for DQM
abrinke1 Jul 25, 2018
ba13342
add SIP plots for final tracks collection
mtosi Jul 27, 2018
8ab3728
fix deepflavour discriminator
Jul 25, 2018
55f8b4f
update documentation
Jul 25, 2018
0b0b740
new process modifier run2_nanoAOD_94X2016
gpetruc Jul 25, 2018
6ebe421
E/g: use the precomputed smearing, add both 2016 and 2017 IDs (readin…
gpetruc Jul 25, 2018
5662338
Fix electrons_cff typo in 94X2016 era
gpetruc Jul 26, 2018
d16f197
fix
mtosi Jul 27, 2018
0c9d1a3
Fix electrons in 94X2016 era to use only Fall17V1 MVA Id
gpetruc Jul 27, 2018
c625ec8
use unordered_set for MET significance footprint
kpedro88 Jul 27, 2018
da85f01
modernize
kpedro88 Jul 27, 2018
490df96
(re)enable HLTDQM + fix naming scheme
mtosi Aug 1, 2018
9158859
fix naming (HLT/Photon/ --> HLT/EXO/Photon)
mtosi Aug 1, 2018
f306f2f
fix naming (HLT/EGM/Photon/ --> HLT/HIG/DiPhoton)
mtosi Aug 1, 2018
09d8755
fix naming (HLT/Higgs --> HLT/HIG)
mtosi Aug 1, 2018
7dfd463
move not needed module in the extra sequence
mtosi Aug 1, 2018
ea27b36
add comment
mtosi Aug 1, 2018
ce751a9
fix typo
mtosi Aug 1, 2018
4f32352
JIRA 326 (Connect caloLayer2 output to uGT input comparison results t…
CarstenHensel Aug 2, 2018
f243221
Fix for start/end conditions
ggovi Aug 3, 2018
f27b31f
moved caloLayer2 part to the uGT section
CarstenHensel Aug 3, 2018
b75ede6
re-added some lines of code that shouldn't have deleted in privious u…
CarstenHensel Aug 3, 2018
a3865fc
Better error visualization for HPTDCs and test file for dat
nminafra Aug 6, 2018
28a1eba
Including ctppsCommonDQMSource requirements in dqm sourceclient
nminafra Aug 6, 2018
3616e1f
Add tau MVA scores/decisions to be saved for 2016 reprocessing with 94X
steggema Aug 2, 2018
3cd7b43
Changed backfill value
kschweiger Aug 7, 2018
15c5405
EMTF fix track address for low-quality tracks
abrinke1 Aug 8, 2018
adcff34
Adding tune-dependent pthat reweighting of Pythia
Aug 8, 2018
16c9276
Change how we calculate GUID
Dr15Jones Aug 8, 2018
17a0016
Merge pull request #24255 from cms-nanoAOD/pr_nano94X2016_master
cmsbuild Aug 13, 2018
4d3a0a5
use hit to sort (not faster)
VinInn Aug 13, 2018
6770541
Merge pull request #24262 from Dr15Jones/changeGUIDcalculation_10_2
cmsbuild Aug 13, 2018
b148a8e
reduce memory, optimize bin iteration
VinInn Aug 13, 2018
fe3b7b3
add latest DeepFlavour training
Aug 11, 2018
99b7f6a
python print migration PhysicsTools/NanoAOD
davidlange6 Jul 27, 2018
2ba7e05
print-function migration and slight improvement of documentation
gpetruc Aug 13, 2018
8b028bd
Merge pull request #192 from cms-nanoAOD/pr191_rebased
gpetruc Aug 13, 2018
5673d05
push Express GT for visualisation to 10_2_X
threus Aug 14, 2018
6b08af9
Change the code for IsoTrkFilter
Aug 14, 2018
7ffa302
Merge pull request #24281 from threus/gt_express_102x
cmsbuild Aug 15, 2018
db7e725
Update PythiaPSweightsSettings_cfi.py
mseidel42 Aug 15, 2018
bc7615d
reduce memory occpancy, use jmax
VinInn Aug 15, 2018
5e272ec
remove redundant checks
VinInn Aug 15, 2018
c0e774b
Changed CSC binary examiner mask to enable ALCT CRC checks
barvic Aug 15, 2018
7d66583
Changed the thresholds & prescale factors with Maria's suggestions
Aug 15, 2018
e76e8a5
Update PythiaPSweightsSettings_cfi.py
mseidel42 Aug 15, 2018
7fa88eb
Merge pull request #24284 from zleba/tuneDepWgt
cmsbuild Aug 16, 2018
ba08068
adding trigger object based tag and probe DQM source
Sam-Harper Aug 6, 2018
a5322a2
Merge pull request #24289 from intrepid42/patch-3
cmsbuild Aug 17, 2018
9841327
Merge pull request #23842 from kreczko/kreczko-issue-CMSLITDPG-585-part5
cmsbuild Aug 17, 2018
3c8955c
Merge pull request #23844 from kreczko/kreczko-issue-CMSLITDPG-590-part1
cmsbuild Aug 17, 2018
fcd16ef
Merge pull request #23845 from kreczko/kreczko-issue-CMSLITDPG-588-part5
cmsbuild Aug 17, 2018
35817ee
Merge pull request #23943 from vukasinmilosevic/CMSLITDPG-612v2_10_2_0
cmsbuild Aug 17, 2018
ee2bc3d
Merge pull request #23952 from tanmaymudholkar/TTF4ByLS_10_2_X
cmsbuild Aug 17, 2018
8e9ca2a
Merge pull request #23986 from mtosi/TRKDQM_muonInnerTrack_2DplotsEna…
cmsbuild Aug 17, 2018
af47347
Merge pull request #24046 from christopheralanwest/hcal-tp-configure-…
cmsbuild Aug 17, 2018
97fc2ee
Merge pull request #24082 from aloeliger/from-CMSSW_10_2_0
cmsbuild Aug 17, 2018
aa0f8ca
Merge pull request #24106 from abrinke1/EMTF_PR_10_2_0_emul_from_CPPF
cmsbuild Aug 17, 2018
fd77524
Merge pull request #24108 from mtosi/TRKHLTDQM_addSIPplots_102X
cmsbuild Aug 17, 2018
1d08b13
Merge pull request #24165 from kpedro88/SpeedupMETSig_1020
cmsbuild Aug 17, 2018
fd83052
Merge pull request #24187 from ggovi/lhcinfo-o2o-2-10_2_X
cmsbuild Aug 17, 2018
3d7b998
Merge pull request #24223 from mtosi/fixTRKDQM_dz0p1
cmsbuild Aug 17, 2018
c86c22f
Merge pull request #24206 from CarstenHensel/calol2_DQM_dev_1020p5
cmsbuild Aug 17, 2018
0fec4de
Merge pull request #24278 from cms-nanoAOD/pr_nano94X2016_master
cmsbuild Aug 17, 2018
78c02b6
Backport 10_2_x
bmahakud Aug 17, 2018
f326f54
Fix invalid PF jet collection for L1T offline jets and sums DQM.
thomreis Aug 17, 2018
13b741a
new pt cut
VinInn Aug 18, 2018
9512324
new interface
VinInn Aug 18, 2018
6214e0f
prototype of vertex finder on gpu
VinInn Aug 19, 2018
d5a6e50
VBF & HWJ gridpack patch
SanghyunKo Aug 20, 2018
64f50a8
updating to use ConcurrentMonitorElements
Sam-Harper Aug 20, 2018
df79e48
Add uGT board comparison quality tests.
thomreis Aug 21, 2018
82058a2
Add quality test for LED misfires
DryRun Aug 22, 2018
1f2d2a3
code review comments
Sam-Harper Aug 22, 2018
4978ce6
JEC MC
Aug 22, 2018
5cedb95
Prompt GT
Aug 22, 2018
150ae07
relval GT
Aug 22, 2018
11174d5
offline GT
Aug 22, 2018
f081abd
Replace object comparison and filter fillDescriptions addDefault with…
thomreis Aug 23, 2018
62de5e5
Apply code checks patch.
thomreis Aug 23, 2018
a8bdab1
initial commit
VinInn Aug 23, 2018
e1cdc07
Provide default parameters in fillDescription.
thomreis Aug 23, 2018
8c3ec79
moving plugins to the plugin dir
Sam-Harper Aug 25, 2018
5047e6d
more code, does not compile yet
VinInn Aug 28, 2018
3dc134e
compiles
VinInn Aug 28, 2018
6e96759
works, disabled to run old divisive...
VinInn Aug 29, 2018
f0963c4
now gpu algo running
VinInn Aug 29, 2018
57b8db3
tranfer reverse pointers
VinInn Aug 29, 2018
611368d
Add flag for validity of H/E in electrons and photons
gpetruc Aug 9, 2018
4c4c608
Add a flag to CaloCluster for bad hcal areas
gpetruc Aug 10, 2018
c596d0c
Propagate bad Hcal information to Electron H/E (set it to a small neg…
gpetruc Aug 2, 2018
4add30a
Bad HCal areas propagation into Photon object
gpetruc Aug 6, 2018
690dd80
Photon producer: make checking Hcal status optional (will be turned o…
gpetruc Aug 6, 2018
39ac07e
code-checks in 10_3_X
gpetruc Aug 17, 2018
b43149c
code checks
gpetruc Aug 17, 2018
782d690
Make checking of Hcal status optional in electron producers (will be …
gpetruc Aug 6, 2018
1f1aba9
Turn on by default the checking of Hcal channels in the electron and …
gpetruc Aug 10, 2018
1c206b3
change commented couts in debug code to if(debug) cout
gpetruc Aug 10, 2018
a8540c3
Skip detids missing in the HcalChannelQuality
gpetruc Aug 15, 2018
9caa2c1
Use invalidHcal flag in electron and photon producers. check H/E == 0…
gpetruc Aug 10, 2018
322b315
Correct accessing constituents of CaloTower
Aug 22, 2018
700388e
Changed thowOnFail to true (Giovanni)
Aug 23, 2018
05ae9bf
Producer of PFClusters marking dead hcal areas
gpetruc Aug 2, 2018
25ba8dd
Remove dead area markers in PFAlgo but remember if a track was linked…
gpetruc Aug 2, 2018
a753533
Quality cuts for tracks in bad Hcal regions
gpetruc Aug 2, 2018
26d94c2
Improve debug output of PFAlgo
gpetruc Aug 2, 2018
2837d45
In dead Hcal areas, restrict ecal-track linking to nearest pair only
gpetruc Aug 2, 2018
8aa417b
CaloTowersCreator: add parameter missingHcalRescaleFactorForEcal to s…
gpetruc Aug 2, 2018
bded4e9
PFEgammaFilters options for bad HCal
gpetruc Aug 2, 2018
18a846d
Propagate debug flag to PFEGammaFilters
gpetruc Aug 2, 2018
43eb2d5
PF Egamma protections (part II)
gpetruc Aug 6, 2018
110bdf7
Fix EleID cuts to be as intented (cut based veto id + relaxed dEta by…
gpetruc Aug 8, 2018
fcab63c
Use invalidHcal flag in PFEGammaFilters.cc
gpetruc Aug 10, 2018
609fa2e
Fix whitespace
gpetruc Aug 10, 2018
680a839
Use deltaEtaSeedClusterTrackAtVtx()
gpetruc Aug 10, 2018
3247814
Use reco::CaloCluster::badHcalMarker instead of 0xDEAD
gpetruc Aug 10, 2018
ea11310
Make badHcal protections in PFEgammaFilters configurable
gpetruc Aug 10, 2018
e17d3d5
Define a modifier PF_badHcalMitigation, and use it to turn on the code
gpetruc Aug 10, 2018
3ea8cb8
PFBadHcalPseudoClusterProducer: activate protection if more than half…
gpetruc Aug 10, 2018
2877446
PFBadHcalPseudoClusterProduce: figure out first depth and subdetector
gpetruc Aug 13, 2018
2846080
Use the medium ID instead of the veto ID for electrons
gpetruc Aug 14, 2018
439b90c
Code review
gpetruc Aug 16, 2018
f1e3fba
Code review
gpetruc Aug 22, 2018
4b9fc96
Code-checks
gpetruc Aug 22, 2018
2435c42
Add customize for parameters in HLT PF
gpetruc Aug 22, 2018
fa5d954
PF_badHcalMitigation -> pf_badHcalMitigation
gpetruc Aug 23, 2018
25d771d
Comment out unused CaloTowerDetId
gpetruc Aug 23, 2018
68fad3d
added tracks to vertex, printouts removed
VinInn Aug 30, 2018
7c9da7d
Clean up and bugfixes for the Riemann fit (#148)
fwyzard Aug 30, 2018
1ce01f2
expose all params
VinInn Aug 30, 2018
46ea6cc
Add a simple MPIService to handle MPI initialisation (#151)
fwyzard Aug 30, 2018
fc770d6
added chi2, error rescaled (small effect)
VinInn Aug 31, 2018
10ad7e9
sort in pt2
VinInn Aug 31, 2018
443f8f0
Merge pull request #24373 from thomreis/l1t_object_comparisons_fillde…
cmsbuild Aug 31, 2018
b9a0dcd
Merge pull request #24323 from bmahakud/from-CMSSW_10_2_2_patch1
cmsbuild Aug 31, 2018
6fcfab7
Merge pull request #24321 from Sam-Harper/TrigObjTnP1021
cmsbuild Aug 31, 2018
63fe485
Merge pull request #24294 from barvic/csc_binary_examiner_mask_change
cmsbuild Aug 31, 2018
1022cd6
Merge pull request #24156 from mtosi/STEAM_enableHLTDQM
cmsbuild Aug 31, 2018
a3a2bb0
Merge pull request #24218 from CTPPS/ctpps_timingdiamond_dqm_aug2018_…
cmsbuild Aug 31, 2018
46552d6
Merge pull request #24236 from abrinke1/EMTF_PR_10_2_1_track_address_fix
cmsbuild Aug 31, 2018
7122e49
Merge pull request #24286 from bsunanda/Run2-alca137
cmsbuild Aug 31, 2018
bc4ea7a
Merge pull request #24334 from thomreis/l1t_offline_dqm_missing_pfjet…
cmsbuild Aug 31, 2018
506b13c
Merge pull request #24353 from thomreis/l1t_dqm_ugt_board_comp_qtests…
cmsbuild Aug 31, 2018
5bb0bbf
Merge pull request #24359 from DryRun/CMSSW_10_2_3_led-quality-test
cmsbuild Aug 31, 2018
02c2113
Merge pull request #24364 from lpernie/102X_JECMC
cmsbuild Aug 31, 2018
50ec399
Merge pull request #24343 from SanghyunKo/VBFHWJreducedPdf_10_2_X
cmsbuild Aug 31, 2018
6e8f631
Merge pull request #24407 from gpetruc/PF_102X
cmsbuild Aug 31, 2018
3d67018
more doc, some cleanup
VinInn Sep 1, 2018
bcb7c44
as usual the test is more complex than the algo
VinInn Sep 1, 2018
cdb91a3
use new utility function
VinInn Sep 1, 2018
794a796
properly rescale error with chi2
VinInn Sep 1, 2018
aa8913e
support 8 and 64 bit int
VinInn Sep 2, 2018
80308a5
support unsigned
VinInn Sep 2, 2018
77dcfa6
SFINAE
VinInn Sep 2, 2018
f156524
const
VinInn Sep 2, 2018
fd5886b
derivation of fast dphi cut
VinInn Sep 2, 2018
4c16b56
python notebook to tune cuts for doublets and triplets
VinInn Sep 2, 2018
305d260
Improve CUDAService log messages (#153)
fwyzard Sep 2, 2018
da89cf3
Add pixel tracking workflows for data (#144)
makortel Sep 2, 2018
9267c90
edm::Wrapper<> de/serialisation (#154)
fwyzard Sep 2, 2018
748b5a7
Synchronise with CMSSW_10_2_4
fwyzard Sep 2, 2018
88ff2cd
Add MTV instance for pixel tracks from PV
makortel Sep 3, 2018
4f0b74f
transfrom errors to global
VinInn Sep 3, 2018
08467e6
fix copy to gpu
VinInn Sep 3, 2018
3f2ea24
Merged mtvPixelTracksFromPV from repository makortel with cms-merge-t…
VinInn Sep 3, 2018
211eb50
Merged DoubletTuning from repository VinInn with cms-merge-topic
VinInn Sep 3, 2018
1a3f02b
tuned params
VinInn Sep 4, 2018
57060ef
support to local as well
VinInn Sep 4, 2018
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 24 additions & 11 deletions Calibration/HcalAlCaRecoProducers/plugins/AlCaIsoTracksFilter.cc
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,8 @@

namespace AlCaIsoTracks {
struct Counters {
Counters() : nAll_(0), nGood_(0), nRange_(0) {}
mutable std::atomic<unsigned int> nAll_, nGood_, nRange_;
Counters() : nAll_(0), nGood_(0), nRange_(0), nHigh_(0) {}
mutable std::atomic<unsigned int> nAll_, nGood_, nRange_, nHigh_;
};
}

Expand Down Expand Up @@ -95,12 +95,12 @@ class AlCaIsoTracksFilter : public edm::stream::EDFilter<edm::GlobalCache<AlCaIs
const double eIsolate_;
const double hitEthrEB_, hitEthrEE0_, hitEthrEE1_;
const double hitEthrEE2_, hitEthrEE3_;
const double pTrackLow_, pTrackHigh_;
const int preScale_;
const double pTrackLow_, pTrackHigh_, pTrackH_;
const int preScale_, preScaleH_;
const std::string theTrackQuality_;
spr::trackSelectionParameters selectionParameter_;
double a_charIsoR_;
unsigned int nRun_, nAll_, nGood_, nRange_;
unsigned int nRun_, nAll_, nGood_, nRange_, nHigh_;
edm::EDGetTokenT<trigger::TriggerEvent> tok_trigEvt_;
edm::EDGetTokenT<edm::TriggerResults> tok_trigRes_;
edm::EDGetTokenT<reco::TrackCollection> tok_genTrack_;
Expand Down Expand Up @@ -146,9 +146,11 @@ AlCaIsoTracksFilter::AlCaIsoTracksFilter(const edm::ParameterSet& iConfig, const
hitEthrEE3_(iConfig.getParameter<double>("EEHitEnergyThreshold3") ),
pTrackLow_(iConfig.getParameter<double>("momentumRangeLow")),
pTrackHigh_(iConfig.getParameter<double>("momentumRangeHigh")),
pTrackH_(iConfig.getParameter<double>("momentumHigh")),
preScale_(iConfig.getParameter<int>("preScaleFactor")),
preScaleH_(iConfig.getParameter<int>("preScaleHigh")),
theTrackQuality_(iConfig.getParameter<std::string>("trackQuality")),
nRun_(0), nAll_(0), nGood_(0), nRange_(0) {
nRun_(0), nAll_(0), nGood_(0), nRange_(0), nHigh_(0) {
//now do what ever initialization is needed
const double isolationRadius(28.9);
// Different isolation cuts are described in DN-2016/029
Expand Down Expand Up @@ -200,7 +202,8 @@ AlCaIsoTracksFilter::AlCaIsoTracksFilter(const edm::ParameterSet& iConfig, const
<<"\t eIsolate_ " << eIsolate_ << "\n"
<<"\t Precale factor " << preScale_
<<"\t in momentum range " << pTrackLow_
<<":" << pTrackHigh_;
<<":" << pTrackHigh_ << " and prescale factor "
<< preScaleH_ << " for p > " << pTrackH_;
for (unsigned int k=0; k<trigNames_.size(); ++k)
edm::LogInfo("HcalIsoTrack") << "Trigger[" << k << "] " << trigNames_[k];
} // AlCaIsoTracksFilter::AlCaIsoTracksFilter constructor
Expand Down Expand Up @@ -323,7 +326,7 @@ bool AlCaIsoTracksFilter::filter(edm::Event& iEvent, edm::EventSetup const& iSet
trkCaloDirections, false);

std::vector<spr::propagatedTrackDirection>::const_iterator trkDetItr;
unsigned int nTracks(0), nselTracks(0), ntrin(0), ntrout(0);
unsigned int nTracks(0), nselTracks(0), ntrin(0), ntrout(0), ntrH(0);
for (trkDetItr = trkCaloDirections.begin(),nTracks=0;
trkDetItr != trkCaloDirections.end(); trkDetItr++,nTracks++) {
const reco::Track* pTrack = &(*(trkDetItr->trkItr));
Expand Down Expand Up @@ -381,6 +384,7 @@ bool AlCaIsoTracksFilter::filter(edm::Event& iEvent, edm::EventSetup const& iSet
<< ":" << eIsolation;
if (t_p>pTrackMin_ && eMipDR<eEcalMax_ && hmaxNearP<eIsolation) {
if (t_p > pTrackLow_ && t_p < pTrackHigh_) ntrin++;
else if (t_p > pTrackH_) ntrH++;
else ntrout++;
}
}
Expand All @@ -391,6 +395,11 @@ bool AlCaIsoTracksFilter::filter(edm::Event& iEvent, edm::EventSetup const& iSet
if (preScale_ <= 1) accept = true;
else if (nRange_%preScale_ == 1) accept = true;
}
if (!accept && ntrH > 0) {
++nHigh_;
if (preScaleH_ <= 1) accept = true;
else if (nHigh_%preScaleH_ == 1) accept = true;
}
}
}
// Step 4: Return the acceptance flag
Expand All @@ -404,12 +413,14 @@ void AlCaIsoTracksFilter::endStream() {
globalCache()->nAll_ += nAll_;
globalCache()->nGood_ += nGood_;
globalCache()->nRange_ += nRange_;
globalCache()->nHigh_ += nHigh_;
}

void AlCaIsoTracksFilter::globalEndJob(const AlCaIsoTracks::Counters* count) {
edm::LogVerbatim("HcalIsoTrack") << "Selects " << count->nGood_ << " in "
<< count->nAll_ << " events and with "
<< count->nRange_ << " events in the p-range";
<< count->nRange_ << " events in the p-range"
<< count->nHigh_ << " events with high p";
}


Expand Down Expand Up @@ -456,7 +467,7 @@ void AlCaIsoTracksFilter::fillDescriptions(edm::ConfigurationDescriptions& descr
desc.add<double>("minimumTrackP",20.0);
// signal zone in ECAL and MIP energy cutoff
desc.add<double>("coneRadiusMIP",14.0);
desc.add<double>("maximumEcalEnergy",2.0);
desc.add<double>("maximumEcalEnergy",100.0);
// following 3 parameters are for isolation cuts and described in the code
desc.add<double>("maxTrackP",8.0);
desc.add<double>("slopeTrackP",0.05090504066);
Expand All @@ -470,7 +481,9 @@ void AlCaIsoTracksFilter::fillDescriptions(edm::ConfigurationDescriptions& descr
// Prescale events only containing isolated tracks in the range
desc.add<double>("momentumRangeLow",20.0);
desc.add<double>("momentumRangeHigh",40.0);
desc.add<int>("preScaleFactor",2);
desc.add<int>("preScaleFactor",10);
desc.add<double>("momentumHigh",60.0);
desc.add<int>("preScaleHigh",2);
descriptions.add("alcaIsoTracksFilter",desc);
}

Expand Down
3 changes: 1 addition & 2 deletions Calibration/HcalAlCaRecoProducers/python/alcaisotrk_cfi.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,5 @@
# Prescale events only containing isolated tracks in the range
MomentumRangeLow = cms.double(20.0),
MomentumRangeHigh = cms.double(40.0),
PreScaleFactor = cms.int32(2)
PreScaleFactor = cms.int32(10)
)

5 changes: 3 additions & 2 deletions CondTools/RunInfo/python/LHCInfoPopConAnalyzerStartFill.py
Original file line number Diff line number Diff line change
Expand Up @@ -70,13 +70,14 @@
record = cms.string('LHCInfoRcd'),
name = cms.untracked.string('LHCInfo'),
Source = cms.PSet(fill = cms.untracked.uint32(6417),
startTime = cms.untracked.string('2018-05-31 00:00:00.000'),
#endTime = cms.untracked.string('2018-05-31 20:13:59.000'),
startTime = cms.untracked.string('2018-04-01 00:00:00.000'),
#endTime = cms.untracked.string('2018-03-25 05:00:00.000'),
samplingInterval = cms.untracked.uint32( 600 ),
endFill = cms.untracked.bool(False),
connectionString = cms.untracked.string("oracle://cms_orcon_adg/CMS_RUNTIME_LOGGER"),
ecalConnectionString = cms.untracked.string("oracle://cms_orcon_adg/CMS_DCS_ENV_PVSS_COND"),
DIPSchema = cms.untracked.string("CMS_BEAM_COND"),
#authenticationPath = cms.untracked.string("."),
debug=cms.untracked.bool(False)
),
loggingOn = cms.untracked.bool(True),
Expand Down
47 changes: 23 additions & 24 deletions CondTools/RunInfo/src/LHCInfoPopConSourceHandler.cc
Original file line number Diff line number Diff line change
Expand Up @@ -830,29 +830,25 @@ void LHCInfoPopConSourceHandler::getNewObjects() {
<< " ); from " << m_name << "::getNewObjects";
}

cond::Time_t lastIov = tagInfo().lastInterval.first;
if( lastIov == 0 ){
cond::Time_t lastSince = tagInfo().lastInterval.first;
if( lastSince == 0 ){
// for a new or empty tag, an empty payload should be added on top with since=1
addEmptyPayload( 1 );
} else {
edm::LogInfo( m_name ) << "The last Iov in tag " << tagInfo().name
<< " valid since " << lastIov
<< " valid since " << lastSince
<< "from " << m_name << "::getNewObjects";
}

cond::Time_t targetIov = cond::time::from_boost( boost::posix_time::second_clock::local_time() );
cond::Time_t endIov = cond::time::MAX_VAL;
//if( m_endFill ){
if( !m_startTime.is_not_a_date_time() ){
targetIov = cond::time::from_boost(m_startTime);
}
if( lastIov > targetIov ) targetIov = lastIov;
boost::posix_time::ptime executionTime = boost::posix_time::second_clock::local_time();
cond::Time_t targetSince = 0;
cond::Time_t endIov = cond::time::from_boost( executionTime );
if( !m_startTime.is_not_a_date_time() ){
targetSince = cond::time::from_boost(m_startTime);
}
if( lastSince > targetSince ) targetSince = lastSince;

if( !m_endTime.is_not_a_date_time() ){
endIov = cond::time::from_boost(m_endTime);
}
//}
edm::LogInfo(m_name) <<"Starting sampling at "<<boost::posix_time::to_simple_string(cond::time::to_boost(targetIov));
edm::LogInfo(m_name) <<"Starting sampling at "<<boost::posix_time::to_simple_string(cond::time::to_boost(targetSince));

//retrieve the data from the relational database source
cond::persistency::ConnectionPool connection;
Expand All @@ -875,36 +871,36 @@ void LHCInfoPopConSourceHandler::getNewObjects() {
session3.transaction().commit();
}

bool iovAdded = false;
while( true ){
if( targetIov >= endIov ){
if( targetSince >= endIov ){
edm::LogInfo( m_name ) <<"Sampling ended at the time "<<boost::posix_time::to_simple_string(cond::time::to_boost( endIov ));
break;
}
bool updateEcal=false;
boost::posix_time::ptime targetTime = cond::time::to_boost( targetIov );
boost::posix_time::ptime targetTime = cond::time::to_boost( targetSince );
boost::posix_time::ptime startSampleTime;
boost::posix_time::ptime endSampleTime;
if( !m_endFill and m_prevPayload->fillNumber() and m_prevPayload->endTime()==0ULL){
// execute the query for the current fill
session.transaction().start(true);
edm::LogInfo( m_name ) <<"Searching started fill #"<<m_prevPayload->fillNumber();
bool foundFill = getFillData( session, m_prevPayload->fillNumber() );
session.transaction().commit();
if(!foundFill ){
edm::LogError( m_name )<<"Could not find fill #"<<m_prevPayload->fillNumber();
break;
}
updateEcal = true;
startSampleTime = cond::time::to_boost(lastIov);
// if fill is going, no further query to do...
if(m_fillPayload->endTime()==0ULL) endIov = targetIov;
startSampleTime = cond::time::to_boost(lastSince);
} else {
session.transaction().start(true);
edm::LogInfo( m_name ) <<"Searching new fill after "<<boost::posix_time::to_simple_string(targetTime);
bool foundFill = getNextFillData( session, targetTime, m_endFill );
session.transaction().commit();
if ( !foundFill ){
edm::LogInfo( m_name )<<"No fill found - END of job.";
addEmptyPayload( targetIov );
if( iovAdded ) addEmptyPayload( targetSince );
break;
}
startSampleTime = cond::time::to_boost(m_fillPayload->createTime());
Expand All @@ -914,11 +910,12 @@ void LHCInfoPopConSourceHandler::getNewObjects() {
unsigned short lhcFill = m_fillPayload->fillNumber();
if( endFillTime == 0ULL ){
edm::LogInfo( m_name ) <<"Found ongoing fill "<<lhcFill<<" created at "<<cond::time::to_boost(startFillTime);
endSampleTime = cond::time::to_boost(targetIov);
endSampleTime = executionTime;
targetSince = endIov;
} else {
edm::LogInfo( m_name ) <<"Found fill "<<lhcFill<<" created at "<<cond::time::to_boost(startFillTime)<<" ending at "<<cond::time::to_boost(endFillTime);
endSampleTime = cond::time::to_boost(endFillTime);
targetIov = endFillTime;
targetSince = endFillTime;
}

session.transaction().start(true);
Expand All @@ -937,7 +934,9 @@ void LHCInfoPopConSourceHandler::getNewObjects() {
size_t niovs = LHCInfoImpl::transferPayloads( m_tmpBuffer, m_payloadBuffer, m_to_transfer, m_prevPayload );
edm::LogInfo( m_name ) <<"Added "<<niovs<<" iovs within the Fill time";
m_tmpBuffer.clear();
if(m_prevPayload->fillNumber() and m_prevPayload->endTime()!=0ULL) addEmptyPayload( m_fillPayload->endTime() );
iovAdded = true;
//if(m_prevPayload->fillNumber() and m_prevPayload->endTime()!=0ULL) addEmptyPayload( m_fillPayload->endTime() );
if(m_prevPayload->fillNumber() and m_fillPayload->endTime()!=0ULL) addEmptyPayload( m_fillPayload->endTime() );
}
}

Expand Down
22 changes: 11 additions & 11 deletions Configuration/AlCa/python/autoCond.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,13 @@
# GlobalTag for MC production (p-Pb collisions) with realistic alignment and calibrations for Run2
'run2_mc_pa' : '102X_mcRun2_pA_v2',
# GlobalTag for Run1 data reprocessing
'run1_data' : '102X_dataRun2_v3',
'run1_data' : '102X_dataRun2_v4',
# GlobalTag for Run2 data reprocessing
'run2_data' : '102X_dataRun2_v3',
'run2_data' : '102X_dataRun2_v4',
# GlobalTag for Run2 data relvals: allows customization to run with fixed L1 menu
'run2_data_relval' : '102X_dataRun2_relval_v4',
'run2_data_relval' : '102X_dataRun2_relval_v5',
# GlobalTag for Run2 data 2016H relvals only: Prompt Conditions + fixed L1 menu (to be removed)
'run2_data_promptlike' : '102X_dataRun2_PromptLike_v4',
'run2_data_promptlike' : '102X_dataRun2_PromptLike_v7',
# GlobalTag for Run1 HLT: it points to the online GT
'run1_hlt' : '101X_dataRun2_HLT_frozen_v6',
# GlobalTag for Run2 HLT: it points to the online GT
Expand All @@ -40,19 +40,19 @@
# GlobalTag for Run2 HLT for HI: it points to the online GT
'run2_hlt_hi' : '101X_dataRun2_HLTHI_frozen_v7',
# GlobalTag for MC production with perfectly aligned and calibrated detector for Phase1 2017 (and 0,0,~0-centred beamspot)
'phase1_2017_design' : '102X_mc2017_design_IdealBS_v3',
'phase1_2017_design' : '102X_mc2017_design_IdealBS_v4',
# GlobalTag for MC production with realistic conditions for Phase1 2017 detector
'phase1_2017_realistic' : '102X_mc2017_realistic_v3',
'phase1_2017_realistic' : '102X_mc2017_realistic_v4',
# GlobalTag for MC production (cosmics) with realistic alignment and calibrations for Phase1 2017 detector, Strip tracker in DECO mode
'phase1_2017_cosmics' : '102X_mc2017cosmics_realistic_deco_v3',
'phase1_2017_cosmics' : '102X_mc2017cosmics_realistic_deco_v4',
# GlobalTag for MC production (cosmics) with realistic alignment and calibrations for Phase1 2017 detector, Strip tracker in PEAK mode
'phase1_2017_cosmics_peak' : '102X_mc2017cosmics_realistic_peak_v3',
'phase1_2017_cosmics_peak' : '102X_mc2017cosmics_realistic_peak_v4',
# GlobalTag for MC production with perfectly aligned and calibrated detector for full Phase1 2018 (and 0,0,0-centred beamspot)
'phase1_2018_design' : '102X_upgrade2018_design_v6',
'phase1_2018_design' : '102X_upgrade2018_design_v7',
# GlobalTag for MC production with realistic conditions for full Phase1 2018 detector
'phase1_2018_realistic' : '102X_upgrade2018_realistic_v11',
'phase1_2018_realistic' : '102X_upgrade2018_realistic_v12',
# GlobalTag for MC production (cosmics) with realistic conditions for full Phase1 2018 detector, Strip tracker in DECO mode
'phase1_2018_cosmics' : '102X_upgrade2018cosmics_realistic_deco_v10',
'phase1_2018_cosmics' : '102X_upgrade2018cosmics_realistic_deco_v11',
# GlobalTag for MC production with perfectly aligned and calibrated detector for Phase1 2019
'phase1_2019_design' : '102X_postLS2_design_v5', # GT containing design conditions for postLS2
# GlobalTag for MC production with perfectly aligned and calibrated detector for Phase1 2019
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
import FWCore.ParameterSet.Config as cms

pf_badHcalMitigation = cms.Modifier()
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
import FWCore.ParameterSet.Config as cms

run2_nanoAOD_94X2016 = cms.Modifier()
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,45 @@
'UncertaintyBands:doVariations = on',
# 3 sets of variations for ISR&FSR up/down
# Reduced sqrt(2)/(1/sqrt(2)), Default 2/0.5 and Conservative 4/0.25 variations
# 32 decorrelated variations of muR and non-singular terms (cNS) for each branching type
'UncertaintyBands:List = {\
isrRedHi isr:muRfac=0.707,fsrRedHi fsr:muRfac=0.707,isrRedLo isr:muRfac=1.414,fsrRedLo fsr:muRfac=1.414,\
isrDefHi isr:muRfac=0.5, fsrDefHi fsr:muRfac=0.5,isrDefLo isr:muRfac=2.0,fsrDefLo fsr:muRfac=2.0,\
isrConHi isr:muRfac=0.25, fsrConHi fsr:muRfac=0.25,isrConLo isr:muRfac=4.0,fsrConLo fsr:muRfac=4.0}',

isrDefHi isr:muRfac=0.5,fsrDefHi fsr:muRfac=0.5,isrDefLo isr:muRfac=2.0,fsrDefLo fsr:muRfac=2.0,\
isrConHi isr:muRfac=0.25,fsrConHi fsr:muRfac=0.25,isrConLo isr:muRfac=4.0,fsrConLo fsr:muRfac=4.0,\
fsr_G2GG_muR_dn fsr:G2GG:muRfac=0.5,\
fsr_G2GG_muR_up fsr:G2GG:muRfac=2.0,\
fsr_G2QQ_muR_dn fsr:G2QQ:muRfac=0.5,\
fsr_G2QQ_muR_up fsr:G2QQ:muRfac=2.0,\
fsr_Q2QG_muR_dn fsr:Q2QG:muRfac=0.5,\
fsr_Q2QG_muR_up fsr:Q2QG:muRfac=2.0,\
fsr_X2XG_muR_dn fsr:X2XG:muRfac=0.5,\
fsr_X2XG_muR_up fsr:X2XG:muRfac=2.0,\
fsr_G2GG_cNS_dn fsr:G2GG:cNS=-2.0,\
fsr_G2GG_cNS_up fsr:G2GG:cNS=2.0,\
fsr_G2QQ_cNS_dn fsr:G2QQ:cNS=-2.0,\
fsr_G2QQ_cNS_up fsr:G2QQ:cNS=2.0,\
fsr_Q2QG_cNS_dn fsr:Q2QG:cNS=-2.0,\
fsr_Q2QG_cNS_up fsr:Q2QG:cNS=2.0,\
fsr_X2XG_cNS_dn fsr:X2XG:cNS=-2.0,\
fsr_X2XG_cNS_up fsr:X2XG:cNS=2.0,\
isr_G2GG_muR_dn isr:G2GG:muRfac=0.5,\
isr_G2GG_muR_up isr:G2GG:muRfac=2.0,\
isr_G2QQ_muR_dn isr:G2QQ:muRfac=0.5,\
isr_G2QQ_muR_up isr:G2QQ:muRfac=2.0,\
isr_Q2QG_muR_dn isr:Q2QG:muRfac=0.5,\
isr_Q2QG_muR_up isr:Q2QG:muRfac=2.0,\
isr_X2XG_muR_dn isr:X2XG:muRfac=0.5,\
isr_X2XG_muR_up isr:X2XG:muRfac=2.0,\
isr_G2GG_cNS_dn isr:G2GG:cNS=-2.0,\
isr_G2GG_cNS_up isr:G2GG:cNS=2.0,\
isr_G2QQ_cNS_dn isr:G2QQ:cNS=-2.0,\
isr_G2QQ_cNS_up isr:G2QQ:cNS=2.0,\
isr_Q2QG_cNS_dn isr:Q2QG:cNS=-2.0,\
isr_Q2QG_cNS_up isr:Q2QG:cNS=2.0,\
isr_X2XG_cNS_dn isr:X2XG:cNS=-2.0,\
isr_X2XG_cNS_up isr:X2XG:cNS=2.0}',

'UncertaintyBands:nFlavQ = 4', # define X=bottom/top in X2XG variations
'UncertaintyBands:MPIshowers = on',
'UncertaintyBands:overSampleFSR = 10.0',
'UncertaintyBands:overSampleISR = 10.0',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# https://github.com/cms-sw/genproductions/blob/060e6d3363a78ecfae90f7f5c46c968992820a56/bin/Powheg/production/V2/13TeV/Higgs/VBF_H_JHUGen_HZZ4L_NNPDF30_13TeV/JHUGen_VBF_H_ZZ4L.input

externalLHEProducer = cms.EDProducer("ExternalLHEProducer",
args = cms.vstring('/cvmfs/cms.cern.ch/phys_generator/gridpacks/slc6_amd64_gcc630/13TeV/Powheg/V2/RelValidation/VBFH/VBF_H_slc6_amd64_gcc630_CMSSW_9_3_9_patch1_VBF_new.tgz'),
args = cms.vstring('/cvmfs/cms.cern.ch/phys_generator/gridpacks/slc6_amd64_gcc630/13TeV/Powheg/V2/RelValidation/VBFH/VBF_H_slc6_amd64_gcc630_CMSSW_9_3_9_patch1_VBF_new_reducedPdf.tgz'),
nEvents = cms.untracked.uint32(1000),
numberOfParameters = cms.uint32(1),
outputFile = cms.string('cmsgrid_final.lhe'),
Expand Down
2 changes: 1 addition & 1 deletion Configuration/Generator/python/VHToH_Pow_LHE_13TeV_cff.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# https://github.com/cms-sw/genproductions/blob/329fda9f8d07c2d4d4e75c9a00279dcd6e78cda7/bin/Powheg/production/VH_from_Hbb/HWplusJ_HanythingJ_NNPDF30_13TeV_M125.input

externalLHEProducer = cms.EDProducer("ExternalLHEProducer",
args = cms.vstring('/cvmfs/cms.cern.ch/phys_generator/gridpacks/slc6_amd64_gcc630/13TeV/Powheg/V2/RelValidation/VH/HWJ_slc6_amd64_gcc630_CMSSW_9_3_9_patch1_VH_new.tgz'),
args = cms.vstring('/cvmfs/cms.cern.ch/phys_generator/gridpacks/slc6_amd64_gcc630/13TeV/Powheg/V2/RelValidation/VH/HWJ_slc6_amd64_gcc630_CMSSW_9_3_9_patch1_VH_new_reducedPdf.tgz'),
nEvents = cms.untracked.uint32(5000),
numberOfParameters = cms.uint32(1),
outputFile = cms.string('cmsgrid_final.lhe'),
Expand Down
Loading