Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
511 commits
Select commit Hold shift + click to select a range
798e806
No more lumi in a PB file name
Jul 15, 2020
62ace98
Zlib compressing ME blobs when saving PB files
Aug 4, 2020
7b99e12
Using a run number from the configuration in Online DQM output filenames
Aug 12, 2020
4fce138
Changed PB saver stream label saving new GUI live snapshots
Aug 12, 2020
b1f6768
ZLib compressing QTest MEs as well (in DQM mode)
Aug 14, 2020
e9d926c
Fixed type name
Aug 21, 2020
b564a26
Merge pull request #31204 from mmusich/G4Refitting_updateBFieldAtBegi…
cmsbuild Aug 22, 2020
12d9fb9
[Puppi] performance improvements
missirol Aug 18, 2020
e02f54c
[Puppi] fixed comment
missirol Aug 20, 2020
22b8692
[Puppi] removed comments
missirol Aug 20, 2020
166956b
[Puppi] style change in var initialisation
missirol Aug 20, 2020
444f651
[Puppi] improved readability
missirol Aug 20, 2020
732729d
Merge pull request #31222 from fwyzard/add_boolean_modules
cmsbuild Aug 25, 2020
0d9e613
Merge pull request #31241 from missirol/devel_111X_puppi_speedup
cmsbuild Aug 26, 2020
487bbe3
Added new DQM GUI support to the rest of the clients
Aug 28, 2020
c97d935
Update phase2_realistic GT ; Use ideal pixel bad components and remov…
tlampen Sep 2, 2020
f032918
Fix deg to rad conversion
Sep 3, 2020
241d1fe
Merge pull request #31323 from tlampen/update-phase2_realistic-in-aut…
cmsbuild Sep 4, 2020
10b90a1
Update Run 3 data GTs to those used in 2020 MWGR3
christopheralanwest Sep 8, 2020
8719b10
Merge pull request #31392 from christopheralanwest/alca-mwgr3_2020-11…
cmsbuild Sep 9, 2020
41dea91
Use angle_units, deltaPhi
Sep 4, 2020
d41c5cf
Sort comparison needs to be 'less than'
makortel Sep 9, 2020
8604bc8
Combine the two sorts
makortel Sep 9, 2020
ea02b13
Replace predicate struct with lambda in std::unique call for complete…
makortel Sep 9, 2020
09da4e6
Merge pull request #31430 from makortel/fixTTUTrackingAlg_111x
cmsbuild Sep 11, 2020
341ae2a
fix bug & adding cluster et as an option
Jingyan95 Jul 7, 2020
bd1a6e0
fix syntax
cerminar Aug 5, 2020
513cfca
code format
cerminar Sep 11, 2020
1c9da52
For backport
quark2 Sep 12, 2020
1f8462e
Merge pull request #31342 from dildick/from-CMSSW_11_1_X_2020-09-02-2…
cmsbuild Sep 15, 2020
b8b405d
Merge pull request #31435 from cerminar/eg_tkmatch_fixCMSSW111_v1
cmsbuild Sep 15, 2020
a19dd60
separate HO depth plots from HB
lwang046 Sep 15, 2020
abc7f7e
Added configurable wait time for external process communication
Dr15Jones Sep 11, 2020
8311bf8
Apply wait time in FWCore/SharedMemory to all waits
Dr15Jones Sep 14, 2020
fe67bdf
Merge pull request #31478 from colizz/dev-111X-sharedMemoryWait
cmsbuild Sep 16, 2020
89a01ac
adapt to puppi v15
ahinzmann Aug 14, 2020
81cb3f2
comments from Slava
ahinzmann Aug 21, 2020
6928102
code format
ahinzmann Aug 21, 2020
d356d0c
no change policy
ahinzmann Sep 17, 2020
d7bbf8c
update v15 recipe
ahinzmann Sep 17, 2020
a2fe219
Merge pull request #31479 from lwang046/split-HOdepth
cmsbuild Sep 17, 2020
a428eb1
undo diff
ahinzmann Sep 17, 2020
9e8a190
undo diff
ahinzmann Sep 17, 2020
d8e6f80
adapt for phase2
ahinzmann Sep 17, 2020
d92deec
adapt for Phase2
ahinzmann Sep 17, 2020
55d8c36
Removed too big histograms
quark2 Sep 21, 2020
62c3b76
add new class/record for fractional prescale
hjkwon260 Aug 6, 2020
4d16022
add fractional prescale helper class
hjkwon260 Aug 6, 2020
f1d2d27
fractional prescale propagation to o2o
hjkwon260 Aug 6, 2020
e464e66
fractional prescale propagation to o2o
hjkwon260 Aug 6, 2020
d617fdb
update prescale o2o tag name
hjkwon260 Aug 6, 2020
8be4617
add fractional prescale class
hjkwon260 Aug 6, 2020
a062cd0
fractional prescale class/rcd (code-format update)
hjkwon260 Aug 6, 2020
71a9d66
fractional prescale propagation to o2o(code cleaning)
hjkwon260 Aug 26, 2020
6abb51c
move to boost mplvector for 111X
hjkwon260 Sep 22, 2020
b0f4e49
Merge pull request #31447 from quark2/dqmfix_111X
cmsbuild Sep 22, 2020
7436913
xrd commands are deprecated, use xrdfs instead
smuzaffar Sep 23, 2020
a269815
use root://eoscms.cern.ch instead of eoscms
smuzaffar Sep 23, 2020
e08962e
Update cmsLHEtoEOSManager.py
smuzaffar Sep 24, 2020
5b494a6
Merge pull request #31560 from cms-sw/backport-CMSSW_11_1_X-31553
cmsbuild Sep 24, 2020
831b292
Merge pull request #31545 from hjkwon260/L1FractionalPrescale_backport
cmsbuild Sep 30, 2020
e3371cd
uGMT adapted for KBMTF muons
dinyar May 24, 2019
9e5c39b
Exposing displaced quantities in internal GMT muon
dinyar Feb 25, 2020
434e749
Fixed equality operator for regional muon cand
dinyar Feb 25, 2020
13cca0b
Including displacement in muon data format
dinyar Feb 25, 2020
1db4a77
Forwarding muon displacement to Global Trigger
dinyar Feb 25, 2020
f2b20c1
Added raw track addresses to L1UpgradeTfMuon branch of L1TNtuples
dinyar May 16, 2019
eb4b164
Put L1 TF track addresses into map in L1TNtuple
dinyar May 16, 2019
08a0670
Renamed tfMuonRawTrAdd to tfMuonHwTrAdd
dinyar May 23, 2019
868539d
Raw track address in L1TNtuple fits into short
dinyar May 23, 2019
f1e5d35
Unpackers for BMTF, uGMT, and uGT adapted for Kalman muons
dinyar Mar 5, 2020
74f5c24
Enabled switching of cancel-out algo based on FW version
dinyar Mar 5, 2020
6ee6f6b
Zero pT indicates empty muon.
dinyar Mar 23, 2020
702afee
Added physical unconstrained pT to muon data format.
dinyar Mar 27, 2020
0002ea5
Fixed indentation
dinyar Mar 27, 2020
23244f2
Added displacement quantities at GMT output to L1TNtuples
dinyar Mar 27, 2020
be04ebf
Reverting change of barrel input collection for uGMT
dinyar Apr 2, 2020
6f456a4
Make unpacker code more readable (and fix a bug)
dinyar Apr 8, 2020
815caa7
Guarding against negative unconstrained pT
dinyar Apr 16, 2020
3a68cf5
Renamed pt2 member of regional muon DF to ptUnconstrained
dinyar Apr 22, 2020
55c9a8b
Configuring GMT inputs by era
dinyar Apr 23, 2020
fad4fd5
Running KBMTF in parallel to BMTF
dinyar Apr 23, 2020
6baf7e8
Refactor muon packer in preparation for Run-3 data format
dinyar Apr 29, 2020
6987455
MuonPacker packs according to era
dinyar May 3, 2020
681f786
Added raw track addresses to L1UpgradeTfMuon branch of L1TNtuples
dinyar May 16, 2019
a4bec95
Regional muon packer adapted for Kalman muons from BMTF
dinyar May 18, 2020
c32d0a4
Made L1TNtuples work with changed raw2digi translator
dinyar May 18, 2020
13fb02a
Fixed a rare bug in the ghost busting for KBMTF
dinyar Jun 29, 2020
bdd6282
Added simKBmtfDigis to FEVTDEBUG event content
dinyar Jun 29, 2020
8182c0c
Correct flipped BMTF track addresses
dinyar Jul 1, 2020
e3fbdc6
Post rebase-fix.
rekovic Sep 28, 2020
392c8ac
code-format
rekovic Sep 28, 2020
f26ca24
Further post-rebase cleanup
dinyar Sep 30, 2020
cb57909
Applied changes from code-checks
dinyar Sep 30, 2020
09f9186
static const -> const for thread safety
slava77 Oct 10, 2020
3c5a655
Merge pull request #31741 from slava77/patch-81
cmsbuild Oct 12, 2020
662e363
First commit.
SohamBhattacharya Oct 13, 2020
055cf1b
Code quality checks.
SohamBhattacharya Oct 13, 2020
3dbaa85
Minor changes.
SohamBhattacharya Oct 13, 2020
0ff2c11
Minor changes.
SohamBhattacharya Oct 13, 2020
c2c4005
Added GEM offlien DQM.
seungjin-yang Oct 15, 2020
b6d7de8
Merge pull request #31819 from seungjin-yang/backport-GEM-Offline-DQM…
cmsbuild Oct 17, 2020
686acca
Merge pull request #31099 from kpedro88/Phase2-WF67-111X
cmsbuild Oct 19, 2020
b4d614f
adapt for phase2
ahinzmann Oct 21, 2020
90a5154
Merge pull request #31766 from SohamBhattacharya/HGCal_ele-reco_11_1_4
cmsbuild Oct 22, 2020
023de93
FedRawDataInputSource parsing of range of TCDS FEDs
smorovic Jun 12, 2020
0ab5804
adding generator of TCDS FED to fakeBU
smorovic Jun 19, 2020
e8b27ee
removed fake GTP FED, use TCDS generator
smorovic Jun 19, 2020
cad8419
Exception thrown in input source instead of assertion when TCDS/GTP FED
smorovic Jun 25, 2020
cc1f760
- fix filelist mode discovery of files in current directory
smorovic Jun 29, 2020
ddfa969
code format
smorovic Jul 30, 2020
b936e55
move custom range setup to constructor
smorovic Jul 30, 2020
b2fd20e
header file fix
smorovic Jul 30, 2020
bf84e3e
code-check
smorovic Jul 30, 2020
62f0a90
moving back to class version 3 for compatibility
smorovic Jul 31, 2020
873f8fa
have both class version 3 and 4 for compatibility
smorovic Jul 31, 2020
5a69c75
fix loop range and improved comment, thanks to @jpata (Joseph Pata)
smorovic Jul 31, 2020
45e0d70
fix single-threaded file deletion and several small memory leaks when
smorovic Mar 20, 2020
b9df843
suppord RAW (FRD) file with header and no JSON file also with file lo…
smorovic Jun 11, 2020
94830f7
Added raw FRD header support to single-buffered/single-threaded input…
smorovic Jun 11, 2020
b61c5d9
improve error handling for file-locking mode. Missing index(raw) file…
smorovic Jun 12, 2020
820e07c
code format
smorovic Jun 12, 2020
58f5c76
added 16bit FRD event flags (used firstly for mc/data flagging).
smorovic Sep 22, 2020
81c6a80
FRD format v6 flags changes (thanks for suggestions from @fwyzard):
smorovic Sep 23, 2020
91c71d7
code-checks
smorovic Sep 23, 2020
7126a83
- improved check in FRDEventMessage view: allow versions [2-6]. For
smorovic Sep 23, 2020
5731017
disable TCDS FED check (creates a lot of warnings) on non-real data e…
smorovic Sep 23, 2020
7aace49
code-format
smorovic Sep 23, 2020
2d862bc
Update FRDStreamSource.cc
smorovic Sep 26, 2020
9449d98
revert DataFormats changes for 11_1_X. They will appear only from 11_2_X
smorovic Oct 22, 2020
6567200
use smart pointers in SiStripClassToMonitorCondData
mmusich Oct 22, 2020
a15087c
backporting of PR 31904
gennai Oct 23, 2020
47a9fe0
crash protection from bad GEM chamber ID from DAQ
jshlee Oct 23, 2020
a7c4f7a
code-checks
jshlee Oct 23, 2020
3dab8f2
Merge pull request #31928 from jshlee/gem-unpacker-crashprot-CMSSW_11…
cmsbuild Oct 24, 2020
962ded4
Merge pull request #31923 from mmusich/smartPointersInSiStripClassToM…
cmsbuild Oct 24, 2020
4c6e354
Modified the python scripts to run using frontier when unitTest=True …
gennai Oct 26, 2020
bbcc394
Log when we can't fill raw eta of uGMT output muons
dinyar Oct 1, 2020
fd78ab8
Reverted regression in BMTF DQM that was introduced during merge
dinyar Oct 1, 2020
4e8cd8b
Versioning RegionalMuonCand data format
dinyar Oct 12, 2020
c3734a8
Fix versionining in iorules, synced with #31848
rekovic Oct 27, 2020
887db16
synchronized with the original PR in 11_2_x
gennai Oct 28, 2020
bb75741
Merge pull request #31679 from cms-l1t-offline/pr-111X-L1T-Unconstrai…
cmsbuild Oct 28, 2020
1280ca4
backporting of new fake client configuration
gennai Oct 28, 2020
969ba69
Merge pull request #31964 from smorovic/11_1_X-backport_v3
cmsbuild Oct 29, 2020
1a54f9a
Update DQM/BeamMonitor/test/Online_BeamMonitor_file.py
gennai Oct 29, 2020
ae8050a
CondDB Logger service ported to 11_1_X
ggovi Oct 30, 2020
b3ca65f
Merge pull request #31976 from MilanoBicocca-pix/dqm_backporting
cmsbuild Oct 30, 2020
b78f8ae
Merge pull request #31990 from ggovi/condcore-lumicondforhlt-2-111X
cmsbuild Nov 3, 2020
a60369b
ECAL wants to have TPs with 5BX, calolayer1 unpacker modified
asavincms Nov 3, 2020
c63f534
Merge pull request #31924 from MilanoBicocca-pix/onlinebeamspotmonito…
cmsbuild Nov 3, 2020
69d037e
Update L1TUtm classes to UTM 0.8.1
Nov 3, 2020
3193570
code-format.
rekovic Nov 4, 2020
f58146d
Merge pull request #31494 from ahinzmann/puppiv15111
cmsbuild Nov 4, 2020
abc83eb
Merge pull request #32015 from asavincms/ModifiedL1TCaloLayer1Unpacke…
cmsbuild Nov 4, 2020
87fc568
Add plots for displaced muon quantities to uGMT DQM
dinyar Apr 20, 2020
d388667
Update uGMT ZS mask to correspond with the ones in future configuration
dinyar Oct 27, 2020
5fd0dd0
Including displaced quantities in BMTF-uGMT comparison plots
dinyar Oct 27, 2020
9cff48a
Gating displaced muon plots by Era
dinyar Oct 28, 2020
2d1714b
Create displaced quantity plots in BMTF vs uGMT comparison for Run-3
dinyar Oct 29, 2020
21083fe
Fixed issue in uGMT comparison plots
dinyar Nov 1, 2020
cbf3e5b
clang format
dinyar Nov 1, 2020
e27e2e2
add customisation for pixel gains to 11_1_X
jsalfeld Nov 8, 2020
f201a7e
Merge pull request #32040 from dinyar/ugmt_kalman-adaptions_DQM_11_1_X
cmsbuild Nov 9, 2020
44313d9
bugfix in validHit and chi2
swagata87 Nov 9, 2020
24a07fc
Remove obsolete records
christopheralanwest Nov 10, 2020
05c67c4
backport of PR:32044, make condition of running a filter prior to pro…
jsalfeld Nov 10, 2020
35bd621
Merge pull request #32062 from swagata87/backport_11_1_bugfix_egm_hlt…
cmsbuild Nov 10, 2020
65dd5a4
add customiseFor2018Input
jsalfeld Nov 10, 2020
b96b2a6
Merge pull request #32074 from christopheralanwest/alca-remove-obsole…
cmsbuild Nov 10, 2020
fc5f429
Merge pull request #32075 from jsalfeld/changeDispMuMuVtxProducer111X
cmsbuild Nov 10, 2020
bfb054f
Merge pull request #32057 from jsalfeld/addCustomisePixelGain
cmsbuild Nov 10, 2020
7ba503e
add DB logging of BeamSpotOnline
Nov 10, 2020
2500654
Merge pull request #32023 from cms-l1t-offline/pr111x-L1-CondFormats-…
cmsbuild Nov 11, 2020
51dd9cf
remove hgcal local reco from reconstruction_trackingOnlyTask for trac…
slava77devel Oct 18, 2020
cac2d77
Merge pull request #32104 from silviodonato/backport_31844
cmsbuild Nov 11, 2020
f7c0805
Fix FRD array version check. Version 6 was not added to the version size
smorovic Nov 11, 2020
ce8e76b
using constexpr
smorovic Nov 11, 2020
d58d894
different initializer syntax compiles
smorovic Nov 12, 2020
b09f79f
code format
smorovic Nov 12, 2020
0428a4f
Merge pull request #32095 from MilanoBicocca-pix/BSforOnlineHLT_PR4_b…
cmsbuild Nov 12, 2020
97153e8
Backport PR #32132
benkrikler Nov 13, 2020
9b7a37f
Merge pull request #31206 from andrius-k/dqm_mwgr_preparation_11_1_3
cmsbuild Nov 14, 2020
2c962ef
Merge pull request #32121 from smorovic/111X-fix-frdversion-array
cmsbuild Nov 15, 2020
6222391
Merge pull request #32135 from benkrikler/BK_backport_32132_to_11-1-x
cmsbuild Nov 15, 2020
e0fd35e
Backport of #29837, w/o Configuration/StandardSequences changes
mariadalfonso Apr 1, 2020
48fec35
Backport #30007
felicepantaleo May 28, 2020
e46e054
Backport of #30815
gartung Jul 17, 2020
8f2f836
Backport #31031
Dr15Jones Aug 3, 2020
15b625e
Partial backport of #31013
JamminJones Jul 30, 2020
e46b82f
Created a ClusterFilter by Algo, Size and Layer Range
felicepantaleo Sep 29, 2020
0f4894b
include an Electromagnetic TrackSeeded iteration as first iteration
felicepantaleo Sep 30, 2020
f787aa2
Add the range of layers to the filter parameters
felicepantaleo Sep 30, 2020
b9ab9e7
Inject tracksters from the track seeded electromagnetic interation in…
felicepantaleo Sep 30, 2020
4347004
create empty multiclusters
felicepantaleo Oct 2, 2020
26aa9f5
Add TrkEM tracksters into the Merge collection
rovere Oct 5, 2020
bc34f00
Select trackster-PID also on EM/Total trackster energy ratio
rovere Oct 5, 2020
4f31467
Fix merge conflict.
rovere Oct 5, 2020
8ff5c2d
Fix input collection for TRK iteration to be the output of EM iteration
felicepantaleo Oct 7, 2020
ff3a586
Sorting seeding regions by track momentum
felicepantaleo Oct 7, 2020
d928499
Use only clusters with minimum size of 3
felicepantaleo Oct 7, 2020
70c6b79
Filter only with a maxLayerId in TRKEM iteration.
felicepantaleo Oct 7, 2020
58aea39
Remove MIP iteration
felicepantaleo Oct 7, 2020
88b0d1f
clang format
felicepantaleo Oct 7, 2020
12b8e60
Limit Global EM iteration to layer 30
felicepantaleo Oct 8, 2020
621b988
Limit track seeded iterations to tracks with at most 2 missing outer …
felicepantaleo Oct 8, 2020
3ededa0
Add TrkEM products to EventContent
felicepantaleo Oct 8, 2020
c14afde
Remove missing layers cut for EM based iterations
felicepantaleo Oct 8, 2020
87e3a55
Introducing a shower_start_max_layer cut
felicepantaleo Oct 8, 2020
5bcbd52
raising shower_start_max_layer from 3 to 7 in EM iterations
felicepantaleo Oct 9, 2020
3ea65f4
Count usage of layer clusters, only for those tracksters passing the …
felicepantaleo Oct 9, 2020
c631951
Increasing missing outer hits from 3 to 5
felicepantaleo Oct 12, 2020
8b6864f
increase missing layer from 0 to 1 and loosen min_cos_theta to 0.961 …
felicepantaleo Oct 12, 2020
a62c80e
tighten min_cos_theta from 0.961 to 0.978 in EM iterations
felicepantaleo Oct 12, 2020
b4236de
Rename parameter missing_layers to skip_layers.
felicepantaleo Oct 13, 2020
de00290
Retuning of PR cuts in EM iterations
felicepantaleo Oct 13, 2020
3f970bd
Introducing two cuts: a max_missing_layers_in_trackster and a minimum…
felicepantaleo Oct 13, 2020
2b87632
Refactoring
felicepantaleo Oct 13, 2020
256c445
Update cuts
rovere Oct 13, 2020
e6ab6a9
Make max_missing_layers_in_trackster cut inclusive
felicepantaleo Oct 13, 2020
8fc2b44
code format
felicepantaleo Oct 13, 2020
9562a23
Move trackster energy calculation after the selections are applied
felicepantaleo Oct 13, 2020
21ee285
Add a new max_longitudinal_sigmaPCA cut for EM iterations, with an in…
felicepantaleo Oct 13, 2020
98218d5
Add a new cut: root_doublet_max_distance_from_seed for TrkEM iteratio…
felicepantaleo Oct 13, 2020
e9fbbfc
clang format
felicepantaleo Oct 13, 2020
f31f7da
fix trackster to seed association
felicepantaleo Oct 14, 2020
c25bd47
Setting max_missing_layers_in_trackster to 2 from 0 in EM iterations
felicepantaleo Oct 14, 2020
e59e5a7
Fix compilation error in C++
rovere Oct 14, 2020
da6d868
Remove duplicate python parameter
rovere Oct 14, 2020
b3a4525
Protect against empty multiclusters (was 7f2d245ca24)
rovere Oct 22, 2020
56631af
Sorting seeding regions by pT rather than p
felicepantaleo Oct 16, 2020
22767df
Added TICL PF interpretation.
felicepantaleo Oct 16, 2020
784b132
Feed PFTICL the correct InputTag
felicepantaleo Oct 19, 2020
672e616
Adapt event content
felicepantaleo Oct 19, 2020
1d1783a
Fix hitpattern call
rovere Oct 22, 2020
36d97c1
Code format
rovere Oct 22, 2020
ac0cdff
Backport of #31881
rovere Oct 30, 2020
244b754
Review comments
felicepantaleo Oct 23, 2020
51092c3
Provide EM and HAD fraction in HGCAL for JetMET for calibration
felicepantaleo Oct 30, 2020
a67b0cb
Manual port of f4c1e2f1f7b and 55110b5d259
rovere Oct 30, 2020
de2521e
Code format
rovere Oct 30, 2020
3cbd1ed
assign track momentum direction at point of closest approach instead …
felicepantaleo Nov 1, 2020
bf70afc
Additional review comments
felicepantaleo Nov 1, 2020
7548442
Make track cuts configurable
felicepantaleo Nov 2, 2020
7884c35
Backport of #31730
apsallid May 11, 2020
02d8281
Backport of #32021
apsallid Nov 2, 2020
48bcd31
Remove unused code
felicepantaleo Nov 9, 2020
76c704b
Merged TICLv2_11_1_X from repository rovere with cms-merge-topic
silviodonato Nov 17, 2020
4d19703
Revert "Backport of #32021"
silviodonato Nov 17, 2020
f9d0e3f
Revert "Backport of #31730"
silviodonato Nov 17, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,17 @@
OutALCARECOTkAlCosmics0T_noDrop = cms.PSet(
SelectEvents = cms.untracked.PSet(
SelectEvents = cms.vstring('pathALCARECOTkAlCosmicsCTF0T',
'pathALCARECOTkAlCosmicsCosmicTF0T',
'pathALCARECOTkAlCosmicsRegional0T')
'pathALCARECOTkAlCosmicsCosmicTF0T',
'pathALCARECOTkAlCosmicsRegional0T',
'pathALCARECOTkAlCosmicsDuringCollisions0T'
)
),
outputCommands = cms.untracked.vstring(
#'keep *_ALCARECOTkAlCosmics*0T_*_*',
'keep *_ALCARECOTkAlCosmicsCTF0T_*_*',
'keep *_ALCARECOTkAlCosmicsCosmicTF0T_*_*',
'keep *_ALCARECOTkAlCosmicsRegional0T_*_*',
'keep *_ALCARECOTkAlCosmicsDuringCollisions0T_*_*',
'keep siStripDigis_DetIdCollection_*_*',
'keep L1AcceptBunchCrossings_*_*_*',
'keep L1GlobalTriggerReadoutRecord_gtDigis_*_*',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,14 @@
src = 'regionalCosmicTracks'
)

# AlCaReco for track based alignment using Cosmic muons reconstructed by Cosmics During Collisions Algorithm
# (same cuts)
ALCARECOTkAlCosmicsDuringCollisions0T = ALCARECOTkAlCosmicsCTF0T.clone(
src = 'cosmicDCTracks'
)

#________________________________Sequences____________________________________
seqALCARECOTkAlCosmicsCTF0T = cms.Sequence(ALCARECOTkAlCosmicsCTF0T)
seqALCARECOTkAlCosmicsCosmicTF0T = cms.Sequence(ALCARECOTkAlCosmicsCosmicTF0T)
seqALCARECOTkAlCosmicsRegional0T = cms.Sequence(ALCARECOTkAlCosmicsRegional0T)
seqALCARECOTkAlCosmicsDuringCollisions0T = cms.Sequence(ALCARECOTkAlCosmicsDuringCollisions0T)
14 changes: 14 additions & 0 deletions Alignment/MillePedeAlignmentAlgorithm/scripts/mps_fire.py
Original file line number Diff line number Diff line change
Expand Up @@ -264,6 +264,15 @@ def write_HTCondor_submit_file_mille(path, script, lib, proxy_path=None):
resources = '-q'+resources+' -m g_cmscaf'
elif "htcondor" in resources:
fire_htcondor = True
schedinfo = subprocess.check_output(["myschedd","show"])
if 'cafalca' in resources:
if not 'tzero' in schedinfo:
print("\nMPS fire: request to use CAF pool which has not been set up. Call `module load lxbatch/tzero` and try again")
exit(1)
else:
if not 'share' in schedinfo:
print("\nMPS fire: request to use standard pool when CAF pool is set up. Call `module load lxbatch/share` and try again")
exit(1)
else:
resources = '-q '+resources

Expand Down Expand Up @@ -322,6 +331,11 @@ def write_HTCondor_submit_file_mille(path, script, lib, proxy_path=None):
resources = '-q cmscafalcamille'
elif "htcondor" in resources:
fire_htcondor = True
schedinfo = subprocess.check_output(["myschedd","show"])
if 'bigmem' in resources:
if not 'share' in schedinfo:
print("\nMPS fire: CAF pool is set up, but request to use high-memory machines which live in the standard pool. Call `module load lxbatch/share` and try again")
exit(1)
else:
resources = '-q '+resources

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -202,9 +202,12 @@ def getTagsMap(db):
con = conddblib.connect(url = conddblib.make_url(db))
session = con.session()
TAG = session.get_dbtype(conddblib.Tag)
q1 = session.query(TAG.object_type).order_by(TAG.name).all()[0]
q2 = session.query(TAG.name).order_by(TAG.name).all()[0]
dictionary = dict(zip(q1, q2))
dictionary = {}
for i in range(0,len(session.query(TAG.object_type).order_by(TAG.name).all())):
q1 = session.query(TAG.object_type).order_by(TAG.name).all()[i][0]
q2 = session.query(TAG.name).order_by(TAG.name).all()[i][0]
dictionary[q1]=q2

return dictionary

def clean_name(s):
Expand Down
7 changes: 7 additions & 0 deletions Alignment/OfflineValidation/scripts/validateAlignments.py
Original file line number Diff line number Diff line change
Expand Up @@ -646,6 +646,13 @@ def main(argv = None):

(options, args) = optParser.parse_args(argv)

if not options.dryRun:
schedinfo = subprocess.check_output(["myschedd","show"])
if not 'tzero' in schedinfo:
print("\nAll-In-One Tool: you need to call `module load lxbatch/tzero` before trying to submit jobs. Please do so and try again")
exit(1)


if not options.restrictTo == None:
options.restrictTo = options.restrictTo.split(",")

Expand Down
2 changes: 2 additions & 0 deletions Alignment/OfflineValidation/test/test_all.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ fi
## copy into local sqlite file the ideal alignment
echo "COPYING locally Ideal Alignment ..."
conddb --yes --db pro copy TrackerAlignment_Upgrade2017_design_v4 --destdb myfile.db
conddb --yes --db pro copy TrackerAlignmentErrorsExtended_Upgrade2017_design_v0 --destdb myfile.db

echo "GENERATING all-in-one tool configuration ..."
cat <<EOF >> validation_config.ini
Expand All @@ -29,6 +30,7 @@ style = 2001
title = express
globaltag = 92X_dataRun2_Express_v2
condition TrackerAlignmentRcd = sqlite_file:myfile.db,TrackerAlignment_Upgrade2017_design_v4
condition TrackerAlignmentErrorExtendedRcd = sqlite_file:myfile.db,TrackerAlignmentErrorsExtended_Upgrade2017_design_v0
color = 2
style = 2402

Expand Down
3 changes: 2 additions & 1 deletion CalibCalorimetry/HcalAlgos/interface/HcalPulseShapes.h
Original file line number Diff line number Diff line change
Expand Up @@ -106,8 +106,9 @@ class HcalPulseShapes {
const HcalPulseShape& computeSiPMShapeHE206();
void computeSiPMShapeData2017();
void computeSiPMShapeData2018();
void computeSiPMShapeMCRecoRun3();
Shape hpdShape_, hfShape_, siPMShapeHO_;
Shape siPMShapeData2017_, siPMShapeData2018_;
Shape siPMShapeData2017_, siPMShapeData2018_, siPMShapeMCRecoRun3_;
Shape hpdShape_v2, hpdShapeMC_v2;
Shape hpdShape_v3, hpdShapeMC_v3;
Shape hpdBV30Shape_v2, hpdBV30ShapeMC_v2;
Expand Down
53 changes: 53 additions & 0 deletions CalibCalorimetry/HcalAlgos/src/HcalPulseShapes.cc
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ Reco MC
202 202 =201, SiPMs Hamamatsu shape (HO)
205 203 siPMShapeData2017_,siPMShapeMC2017_ SiPMs from Data, Hamamatsu shape (HE 2017)
207 206 siPMShapeData2018_,siPMShapeMC2018_ SiPMs from Data, Hamamatsu shape (HE 2018)
207 208 siPMShapeData2018_,siPMShapeMCRecoRun3_ SiPMs from Data, 2021 MC phase scan
301 301 hfShape_ regular HF PMT shape
401 401 regular ZDC shape
-------------------------------------------------------------------------------------------
Expand Down Expand Up @@ -124,13 +125,15 @@ Reco MC
computeSiPMShapeHO();
computeSiPMShapeData2017();
computeSiPMShapeData2018();
computeSiPMShapeMCRecoRun3();

theShapes[201] = &siPMShapeHO_;
theShapes[202] = theShapes[201];
theShapes[203] = &(computeSiPMShapeHE203());
theShapes[205] = &siPMShapeData2017_;
theShapes[206] = &(computeSiPMShapeHE206());
theShapes[207] = &siPMShapeData2018_;
theShapes[208] = &siPMShapeMCRecoRun3_;
theShapes[301] = &hfShape_;
//theShapes[401] = new CaloCachedShapeIntegrator(&theZDCShape);
}
Expand Down Expand Up @@ -271,6 +274,56 @@ void HcalPulseShapes::computeHFShape() {
hfShape_.setShapeBin(j, ntmp[j]);
}
}
void HcalPulseShapes::computeSiPMShapeMCRecoRun3() {
//modified shape 206
//7.2 ns shift in 206
unsigned int nbin = 250;
std::array<float, 250> nt{
{0, 0, 0, 0, 0, 0, 0, 0.000117468,
0.0031549, 0.0117368, 0.0219974, 0.0305776, 0.0365429, 0.0400524, 0.0415915, 0.0416765,
0.0408111, 0.0394627, 0.0379353, 0.0363688, 0.0348152, 0.0332891, 0.0317923, 0.0303237,
0.028883, 0.0274714, 0.0260914, 0.0247462, 0.0234392, 0.0221738, 0.0209531, 0.0197793,
0.0186544, 0.0175796, 0.0165556, 0.0155823, 0.0146596, 0.0137866, 0.0129623, 0.0121853,
0.0114539, 0.0107665, 0.0101213, 0.0095162, 0.00894934, 0.00841873, 0.0079224, 0.00745841,
0.00702487, 0.00661995, 0.00624189, 0.00588898, 0.00555961, 0.00525223, 0.00496539, 0.0046977,
0.00444786, 0.00421464, 0.00399689, 0.00379353, 0.00360355, 0.00342602, 0.00326004, 0.0031048,
0.00295954, 0.00282355, 0.00269616, 0.00257676, 0.00246479, 0.00235972, 0.00226106, 0.00216834,
0.00208117, 0.00199914, 0.00192189, 0.0018491, 0.00178044, 0.00171565, 0.00165445, 0.00159659,
0.00154186, 0.00149003, 0.00144092, 0.00139435, 0.00135015, 0.00130816, 0.00126825, 0.00123027,
0.00119412, 0.00115966, 0.0011268, 0.00109544, 0.00106548, 0.00103685, 0.00100946, 0.000983242,
0.000958125, 0.000934047, 0.000910949, 0.000888775, 0.000867475, 0.000847, 0.000827306, 0.000808352,
0.000790097, 0.000772506, 0.000755545, 0.000739182, 0.000723387, 0.000708132, 0.00069339, 0.000679138,
0.000665352, 0.00065201, 0.000639091, 0.000626577, 0.00061445, 0.000602692, 0.000591287, 0.00058022,
0.000569477, 0.000559044, 0.000548908, 0.000539058, 0.000529481, 0.000520167, 0.000511106, 0.000502288,
0.000493704, 0.000485344, 0.000477201, 0.000469266, 0.000459912, 0.000448544, 0.000437961, 0.000428079,
0.000418825, 0.000410133, 0.000401945, 0.00039421, 0.000386883, 0.000379924, 0.000373298, 0.000366973,
0.000360922, 0.00035512, 0.000349545, 0.000344179, 0.000339003, 0.000334002, 0.000329163, 0.000324475,
0.000319925, 0.000315504, 0.000311204, 0.000307017, 0.000302935, 0.000298954, 0.000295066, 0.000291267,
0.000287553, 0.000283919, 0.000280361, 0.000276877, 0.000273462, 0.000270114, 0.000266831, 0.000263609,
0.000260447, 0.000257343, 0.000254295, 0.0002513, 0.000248358, 0.000245467, 0.000242625, 0.000239831,
0.000237083, 0.000234381, 0.000231723, 0.000229109, 0.000226536, 0.000224005, 0.000221514, 0.000219062,
0.000216648, 0.000214272, 0.000211933, 0.00020963, 0.000207362, 0.000205129, 0.000202929, 0.000200763,
0.000198629, 0.000196526, 0.000194455, 0.000192415, 0.000190405, 0.000188424, 0.000186472, 0.000184548,
0.000182653, 0.000180784, 0.000178943, 0.000177127, 0.000175338, 0.000173574, 0.000171835, 0.00017012,
0.000168429, 0.000166762, 0.000165119, 0.000163498, 0.000161899, 0.000160322, 0.000158767, 0.000157233,
0.000155721, 0.000154228, 0.000152756, 0.000151304, 0.000149871, 0.000148457, 0.000147062, 0.000145686,
0.000144327, 0.000142987, 0.000141664, 0.000140359, 0.000139071, 0.000137799, 0.000136544, 0.000135305,
0.000134082, 0.000132874, 0.000131682, 0.000130505, 0.000129344, 0.000128196, 0.000127064, 0.000125945,
0.00012484, 0.00012375, 0.000122672, 0.000121608, 0.000120558, 0.00011952, 0.000118495, 0.000117482,
0.000116482, 0.000115493}};

siPMShapeMCRecoRun3_.setNBin(nbin);

double norm = 0.;
for (unsigned int j = 0; j < nbin; ++j) {
norm += (nt[j] > 0) ? nt[j] : 0.;
}

for (unsigned int j = 0; j < nbin; ++j) {
nt[j] /= norm;
siPMShapeMCRecoRun3_.setShapeBin(j, nt[j]);
}
}

void HcalPulseShapes::computeSiPMShapeData2018() {
//Combination of all phase scan data (May,Jul,Oct2017)
Expand Down
2 changes: 2 additions & 0 deletions CommonTools/PileupAlgos/interface/PuppiAlgo.h
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@ class PuppiAlgo {
inline double rms() const { return cur_RMS; }
inline double median() const { return cur_Med; }

inline double etaMaxExtrap() const { return fEtaMaxExtrap; }

private:
unsigned int fNAlgos;
std::vector<double> fEtaMax;
Expand Down
36 changes: 10 additions & 26 deletions CommonTools/PileupAlgos/interface/PuppiCandidate.h
Original file line number Diff line number Diff line change
@@ -1,29 +1,13 @@
#ifndef CommonTools_PileupAlgos_PuppiCandidate
#define CommonTools_PileupAlgos_PuppiCandidate

#include "fastjet/PseudoJet.hh"

// Extension of fastjet::PseudoJet that caches eta and some other info
// Puppi uses register to decide between NHs, PV CHs, and PU CHs.
class PuppiCandidate : public fastjet::PseudoJet {
public:
using fastjet::PseudoJet::PseudoJet;
double pseudorapidity() const {
_ensure_valid_eta();
return _eta;
}
double eta() const { return pseudorapidity(); }
void _ensure_valid_eta() const {
if (_eta == fastjet::pseudojet_invalid_rap)
_eta = fastjet::PseudoJet::pseudorapidity();
}
void set_info(int puppi_register) { _puppi_register = puppi_register; }
inline int puppi_register() const { return _puppi_register; }

private:
// variable names in fastjet style
mutable double _eta = fastjet::pseudojet_invalid_rap;
int _puppi_register;
#ifndef CommonTools_PileupAlgos_PuppiCandidate_h
#define CommonTools_PileupAlgos_PuppiCandidate_h

struct PuppiCandidate {
double pt{0};
double eta{0};
double phi{0};
double m{0};
double rapidity{0};
int id{0};
};

#endif
7 changes: 3 additions & 4 deletions CommonTools/PileupAlgos/interface/PuppiContainer.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
#define COMMONTOOLS_PUPPI_PUPPICONTAINER_H_

#include "CommonTools/PileupAlgos/interface/PuppiAlgo.h"
#include "CommonTools/PileupAlgos/interface/RecoObj.h"
#include "CommonTools/PileupAlgos/interface/PuppiCandidate.h"
#include "CommonTools/PileupAlgos/interface/RecoObj.h"

class PuppiContainer {
public:
Expand All @@ -13,7 +13,6 @@ class PuppiContainer {
void setNPV(int iNPV) { fNPV = iNPV; }

std::vector<PuppiCandidate> const &pfParticles() const { return fPFParticles; }
std::vector<PuppiCandidate> const &pvParticles() const { return fChargedPV; }
std::vector<double> const &puppiWeights();
const std::vector<double> &puppiRawAlphas() { return fRawAlphas; }
const std::vector<double> &puppiAlphas() { return fVals; }
Expand Down Expand Up @@ -43,7 +42,8 @@ class PuppiContainer {
bool fPuppiDiagnostics;
const std::vector<RecoObj> *fRecoParticles;
std::vector<PuppiCandidate> fPFParticles;
std::vector<PuppiCandidate> fChargedPV;
std::vector<PuppiCandidate> fPFParticlesForVar;
std::vector<PuppiCandidate> fPFParticlesForVarChargedPV;
std::vector<double> fWeights;
std::vector<double> fVals;
std::vector<double> fRawAlphas;
Expand All @@ -62,7 +62,6 @@ class PuppiContainer {
double fPtMaxNeutralsStartSlope;
int fNAlgos;
int fNPV;
double fPVFrac;
std::vector<PuppiAlgo> fPuppiAlgo;
};
#endif
33 changes: 23 additions & 10 deletions CommonTools/PileupAlgos/plugins/PuppiProducer.cc
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
#include "DataFormats/Common/interface/Association.h"
//Main File
#include "CommonTools/PileupAlgos/plugins/PuppiProducer.h"
#include "CommonTools/PileupAlgos/interface/PuppiCandidate.h"

// ------------------------------------------------------------------------------------------
PuppiProducer::PuppiProducer(const edm::ParameterSet& iConfig) {
Expand All @@ -32,6 +31,8 @@ PuppiProducer::PuppiProducer(const edm::ParameterSet& iConfig) {
fEtaMaxCharged = iConfig.getParameter<double>("EtaMaxCharged");
fPtMaxPhotons = iConfig.getParameter<double>("PtMaxPhotons");
fEtaMaxPhotons = iConfig.getParameter<double>("EtaMaxPhotons");
fNumOfPUVtxsForCharged = iConfig.getParameter<uint>("NumOfPUVtxsForCharged");
fDZCutForChargedFromPUVtxs = iConfig.getParameter<double>("DeltaZCutForChargedFromPUVtxs");
fUseExistingWeights = iConfig.getParameter<bool>("useExistingWeights");
fClonePackedCands = iConfig.getParameter<bool>("clonePackedCands");
fVtxNdofCut = iConfig.getParameter<int>("vtxNdofCut");
Expand Down Expand Up @@ -97,15 +98,15 @@ void PuppiProducer::produce(edm::Event& iEvent, const edm::EventSetup& iSetup) {
const reco::Vertex* closestVtx = nullptr;
double pDZ = -9999;
double pD0 = -9999;
int pVtxId = -9999;
bool lFirst = true;
uint pVtxId = 0;
bool isLepton = ((std::abs(pReco.pdgId) == 11) || (std::abs(pReco.pdgId) == 13));
const pat::PackedCandidate* lPack = dynamic_cast<const pat::PackedCandidate*>(&aPF);
if (lPack == nullptr) {
const reco::PFCandidate* pPF = dynamic_cast<const reco::PFCandidate*>(&aPF);
double curdz = 9999;
int closestVtxForUnassociateds = -9999;
const reco::TrackRef aTrackRef = pPF->trackRef();
bool lFirst = true;
for (auto const& aV : *pvCol) {
if (lFirst) {
if (aTrackRef.isNonnull()) {
Expand Down Expand Up @@ -157,10 +158,12 @@ void PuppiProducer::produce(edm::Event& iEvent, const edm::EventSetup& iSetup) {
pReco.id = 3;
else if (tmpFromPV == 0) {
pReco.id = 2;
} // 0 is associated to PU vertex
else if (tmpFromPV == 3) {
if (fNumOfPUVtxsForCharged > 0 and (pVtxId <= fNumOfPUVtxsForCharged) and
(std::abs(pDZ) < fDZCutForChargedFromPUVtxs))
pReco.id = 1;
} else if (tmpFromPV == 3)
pReco.id = 1;
} else if (tmpFromPV == 1 || tmpFromPV == 2) {
else if (tmpFromPV == 1 || tmpFromPV == 2) {
pReco.id = 0;
if ((fPtMaxCharged > 0) and (pReco.pt > fPtMaxCharged))
pReco.id = 1;
Expand All @@ -185,12 +188,20 @@ void PuppiProducer::produce(edm::Event& iEvent, const edm::EventSetup& iSetup) {
pReco.id = 0;
}
if (std::abs(pReco.charge) > 0) {
if (fPuppiNoLep && isLepton)
if (fPuppiNoLep && isLepton) {
pReco.id = 3;
else if (lPack->fromPV() == 0) {
} else if (lPack->fromPV() == 0) {
pReco.id = 2;
} // 0 is associated to PU vertex
else if (lPack->fromPV() == (pat::PackedCandidate::PVUsedInFit)) {
if ((fNumOfPUVtxsForCharged > 0) and (std::abs(pDZ) < fDZCutForChargedFromPUVtxs)) {
for (size_t puVtx_idx = 1; puVtx_idx <= fNumOfPUVtxsForCharged && puVtx_idx < pvCol->size();
++puVtx_idx) {
if (lPack->fromPV(puVtx_idx) >= 2) {
pReco.id = 1;
break;
}
}
}
} else if (lPack->fromPV() == (pat::PackedCandidate::PVUsedInFit)) {
pReco.id = 1;
} else if (lPack->fromPV() == (pat::PackedCandidate::PVTight) ||
lPack->fromPV() == (pat::PackedCandidate::PVLoose)) {
Expand Down Expand Up @@ -373,6 +384,8 @@ void PuppiProducer::fillDescriptions(edm::ConfigurationDescriptions& description
desc.add<double>("EtaMaxPhotons", 2.5);
desc.add<double>("PtMaxNeutrals", 200.);
desc.add<double>("PtMaxNeutralsStartSlope", 0.);
desc.add<uint>("NumOfPUVtxsForCharged", 0);
desc.add<double>("DeltaZCutForChargedFromPUVtxs", 0.2);
desc.add<bool>("useExistingWeights", false);
desc.add<bool>("clonePackedCands", false);
desc.add<int>("vtxNdofCut", 4);
Expand Down
2 changes: 2 additions & 0 deletions CommonTools/PileupAlgos/plugins/PuppiProducer.h
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,8 @@ class PuppiProducer : public edm::stream::EDProducer<> {
double fEtaMaxCharged;
double fPtMaxPhotons;
double fEtaMaxPhotons;
uint fNumOfPUVtxsForCharged;
double fDZCutForChargedFromPUVtxs;
bool fUseExistingWeights;
bool fClonePackedCands;
int fVtxNdofCut;
Expand Down
2 changes: 2 additions & 0 deletions CommonTools/PileupAlgos/python/Puppi_cff.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@
UseDeltaZCut = cms.bool(True),
EtaMinUseDeltaZ = cms.double(2.4),
DeltaZCut = cms.double(0.3),
NumOfPUVtxsForCharged = cms.uint32(0),
DeltaZCutForChargedFromPUVtxs = cms.double(0.2),
PtMaxCharged = cms.double(20.),
EtaMaxCharged = cms.double(99999.),
PtMaxPhotons = cms.double(-1.),
Expand Down
Loading