Simple merge on to latest and fix conflict#7
Open
mark-grimes wants to merge 2119 commits into
Open
Conversation
…x-clang-warning fix clang static analyzer warning using namespace in header
…x-clang-warning Event filter utilities fix clang warning
…g-warning fix clang static analyzer warning using namespace in header
…ix-clang-warning fix clang static analyzer warning using namespace in header
…x-clang-warning fix clang static analyzer warning using namespace in header
Fix bug preventing the use of a local cache
…g_76x_part2 more cleanup of RecoLocalMuon/RPCRecHit
…x-clang-warning fix clang static analyzer warning using namespace in header
…g-warning fix clang static analyzer warning using namespace in header
…lectorCleanup Thread Safety: Remove unneeded state from TriggerResultsBasedEventSelector
Switch to latest pileup jet id in DQM
Signed-off-by: wmtan <wmtan@fnal.gov>
…st-away Only check const cast away in CStyle casts and const_cast<> expresssions
Maintainability cleanup for EventSelector
Forward originalAlgo and algoMask in TrackRefitter
…Consume Release shared resources when use mayConsumes
75x Fireworks: auto-detect configuration after opening first file -- git reattempt 2
Fix a 'kNoTypesStored' bug in DQMRootSource (76x)
Made BeamCurrentInfo thread-safe via use of iorules
…e-76X Streamer output modules ported to one::OutputModule (76X)
DiEle25 dqm update
Add customize configuration file to produce/keep a collection of part…
Conflicts: HLTrigger/Configuration/python/customizeHLTforCMSSW.py
bsunanda
pushed a commit
that referenced
this pull request
Dec 4, 2015
Herwig++: Create config for CMS tune CUETHppS1
bsunanda
pushed a commit
that referenced
this pull request
Jun 29, 2017
…Update_hPFCalib_fromArun HLT PF Calibration update compliant with code changes
bsunanda
pushed a commit
that referenced
this pull request
Jul 7, 2017
stopping throws on duplicate superclusters in the event & other debugging info
bsunanda
pushed a commit
that referenced
this pull request
Jul 25, 2017
…Update_hPFCalib_fromArun (allow empty) HLT PF Calibration update compliant with code changes
bsunanda
pushed a commit
that referenced
this pull request
Jan 19, 2018
use old thresholds when running collapsed 2018
bsunanda
pushed a commit
that referenced
this pull request
Jun 14, 2019
Modificacion to add v2 in the python config
bsunanda
pushed a commit
that referenced
this pull request
May 22, 2020
…ms (L1Trigger/TrackFindingTMTT) (cms-sw#29381) * create separate PRs for the two L1TK packages * Improved KF efficiency at high eta * Moved MC data files to cms-data * Removed old file * Removed KF HLS to put instead in external library * Ran scram b code-format * Delete KF4ParamsComb.h.bak * Delete KF4ParamsCombIV.bak * Delete KF4ParamsCombV2.bak * Delete KF5ParamsComb.h.bak * Delete KF4ParamsComb.cc.bak * Delete KF4ParamsCombIV.bak * Delete KF4ParamsCombV2.bak * Delete KF5ParamsComb.cc.bak * L1 tk integration tmtt pre5 (#7) * Added CMS code style fixes * Removed old file * Reapplied stub b code-format * All code review changes (#13) * Fix clang errors (#14) * fixed clang error * directory for MC txt files * Fixed clang warnings + minor simplifications (#15) * tweak * tweak * Fixed clang warnings and small simplifications * Fixed clang warnings and small simplifications * All remaining review comments addressed (cms-sw#16) * Replaced vector size with empty function * Simplified DegradeBend and StubWindowSuggest * Fixed more review comments * More review comments * code reformat * Ran exhaustive clang tidy * Added library to BuildFile.xml (cms-sw#17) * Deleted TrackFindingTMT/data/README (cms-sw#18) * Added library to BuildFile.xml (This was already done yesterday. Not sure why it appears again) * README file in data directory deleted * Fix review comments (cms-sw#20) Co-authored-by: Louise Skinnari <louise.skinnari@cern.ch>
bsunanda
pushed a commit
that referenced
this pull request
Aug 7, 2020
add Global Tags for geometries T21, T22, T23 and adjust customizations in the upgradeWorkflowComponents file
bsunanda
pushed a commit
that referenced
this pull request
Jun 3, 2022
Code maintenance for Run III in the DQMOffline ZCounting.
bsunanda
pushed a commit
that referenced
this pull request
May 7, 2023
bsunanda
pushed a commit
that referenced
this pull request
May 15, 2025
remove version from dictionary
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
20 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
I tried to make the minimum changes possible but I couldn't get it to work. Basically all that is required is 1f0efe1, but cherry-picking gives the commit a different SHA hash and git will still complain about conflicts even if the file is the same. So all I did for this was merge the full pull request on the latest head, and fix the conflict by hand. Hence almost all of the changes listed below are just the difference between the point you last rebased onto and the current head.
I've checked by merging both this and PR10353 onto the head, and there is no difference between them.
I also copied the differences listed in a browser at cms-sw/cmssw@cms-sw:CMSSW_7_6_X...mark-grimes:simpleMergeAndFix and https://github.com/cms-sw/cmssw/pull/10353/files into text files and diffed them, and found nothing except the
customiseFor10911function incustomizeHLTforCMSSW.py(which is the source of the conflict and should be there).