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.

Sign up for GitHub

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

Jump to bottom

Fix forward port CMSSW_7_2_ROOT6_X #5108

Merged
merged 136 commits into from Aug 29, 2014
Merged

Fix forward port CMSSW_7_2_ROOT6_X #5108

merged 136 commits into from Aug 29, 2014

Conversation

ktf
Copy link
Contributor

@ktf ktf commented Aug 29, 2014

Due to a non-resolvable conflict, git stopped merging CMSSW_7_2_X in CMSSW_7_2_ROOT6_X. This fixes the issue by explicitly deleting the files which got deleted in CMSSW_7_2_X and should resume automatic updates.

quertenmont and others added 30 commits August 7, 2014 09:34
@quertenmont
test
ddd16fd
@quertenmont
fixed estimator
c21765a
@quertenmont
fix discriminator
5dc7dda
@quertenmont
Reorganize RecoTracker/DeDx to reduce the memory footprint and cpu time
25c4120
Add Higgs Photon Jet DQM
8e1595a
add triggers check
bd98a91
add triggered check
65f0460
@quertenmont
remove deprecated files
367e164
@quertenmont
remove unused function
683f55c
comment out not used code
181d47e
clean up
d492005
clean up
54a17e6
remove unused code
aee7aec
add HigPhotonJet in DQM
0d982d5
@wmtan
Don't check dictionaries unnecessarily
ea81374
add number of pfjets
6e34f88
add photon rapidity
1cc5b64
add pfmet phi
00dcc9e
add triggerAccept switch
1766d16
add triggerAccept switch
0ab6788
@wmtan
Adopt changes suggested by Chris Jones
6358db3
add delphijetmet
740cf36
add invmassjj
da7757f
add deltajj
71697c3
@quertenmont
Merged DEDXUpdates from repository quertenmont
cb08cc2
@quertenmont
fix python reference in DQM and Validation packages
aafa148
@quertenmont
yet another bug fix in python config
3d72656
add triggers 1D
0e570be
add trigvsnvtx
3be22ce
comment out calojets
ff30016
VinInn and others added 10 commits August 29, 2014 10:17
@VinInn
fix long standing typo
e6c46ac
@ktf
Fix -mrecip errors in clang.
bbe468b 
Notice that I had to drop the commented flag because it looks like
scram is actually ignoring the (non XML valid) # comment.
@ktf
Merge pull request cms-sw#5103 from ktf/fix-clang
8aedb3a 
Fix `-mrecip` errors in clang.
@VinInn
sed -i 's/fabs/std::abs/g'
2fa1705
@nclopezo
Merge pull request cms-sw#5102 from VinInn/fixTID
4282c51 
RecoTracker/TkDetLayers -- fix long standing typo in TIDLayer
@nclopezo
Merge pull request cms-sw#5097 from wmtford/stripRecHitsValid
f9a8555 
Validation/TrackerRecHits -- Add a few new strip recHit validation histograms
@nclopezo
Merge pull request cms-sw#5089 from degrutto/new-CSCTF_250714_72X_201…
e71a186 
…4-08-28-0200

L1Trigger/CSCTrackFinder -- adapt new-CSCTF_250714 (62X_SLHC) to 72X
@ktf
Merge pull request cms-sw#5076 from mtosi/from-CMSSW_7_2_X_2014-08-27…
6e18eed 
…-0200_stripClusterDQM@HLT_ON-OFFtrack

Strip cluster on/off track dqm@hlt
@ktf
Merge pull request cms-sw#5087 from rovere/fix_range_in_vertex_valida…
ef739f3 
…tion_plots

Improve histo ranges
@ktf
Merge remote-tracking branch 'cms-sw/CMSSW_7_2_X' into work
ee841c5 
Conflicts:
	DataFormats/Provenance/interface/WrapperInterfaceBase.h
	FWCore/Utilities/interface/HideStdSharedPtrFromRoot.h
	SUSYBSMAnalysis/Skimming/plugins/BuildFile.xml
@ktf ktf changed the title give Fix forward port CMSSW_7_2_ROOT6_X Aug 29, 2014
@cmsbuild
Copy link
Contributor

A new Pull Request was created by @ktf (Giulio Eulisse) for CMSSW_7_2_ROOT6_X.

give

It involves the following packages:

Alignment/LaserAlignment
Alignment/MuonAlignmentAlgorithms
CalibCalorimetry/EcalLaserAnalyzer
CalibCalorimetry/EcalPedestalOffsets
CalibMuon/DTCalibration
CalibTracker/SiPixelGainCalibration
CalibTracker/SiStripChannelGain
CalibTracker/SiStripLorentzAngle
Calibration/EcalCalibAlgos
Calibration/Tools
CondCore/CondDB
Configuration/AlCa
Configuration/Skimming
DPGAnalysis/Skims
DQM/BeamMonitor
DQM/DTMonitorClient
DQM/EcalPreshowerMonitorClient
DQM/HcalMonitorTasks
DQM/SiPixelHistoricInfoClient
DQM/SiStripCommissioningAnalysis
DQM/SiStripMonitorCluster
DQM/SiStripMonitorTrack
DQM/TrackingMonitor
DQM/TrackingMonitorSource
DQMOffline/JetMET
DQMOffline/PFTau
DQMOffline/RecoB
DQMOffline/Trigger
DQMServices/Components
DQMServices/Core
DQMServices/Examples
DataFormats/TrackReco
DetectorDescription/RegressionTest
EventFilter/CSCRawToDigi
FWCore/Concurrency
FWCore/Framework
FWCore/TFWLiteSelector
Fireworks/ParticleFlow
Geometry/CommonDetUnit
HLTrigger/Configuration
HLTriggerOffline/Higgs
L1Trigger/CSCTrackFinder
L1Trigger/RegionalCaloTrigger
PhysicsTools/PatAlgos
RecoEgamma/EgammaPhotonAlgos
RecoEgamma/ElectronIdentification
RecoHI/HiTracking
RecoLocalCalo/EcalRecAlgos
RecoLocalTracker/SiPixelClusterizer
RecoPixelVertexing/PixelLowPtUtilities
RecoTauTag/RecoTau
RecoTracker/DeDx
RecoTracker/TkDetLayers
RecoTracker/TrackProducer
RecoVertex/BeamSpotProducer
RecoVertex/PrimaryVertexProducer
SLHCUpgradeSimulations/Configuration
SUSYBSMAnalysis/Configuration
SUSYBSMAnalysis/HSCP
SUSYBSMAnalysis/Skimming
SimG4Core/GFlash
TrackingTools/GsfTools
TrackingTools/GsfTracking
TrackingTools/KalmanUpdators
TrackingTools/TrackFitters
TrackingTools/TrajectoryState
Validation/EventGenerator
Validation/RecoEgamma
Validation/RecoParticleFlow
Validation/RecoTrack
Validation/RecoVertex
Validation/TrackerRecHits

@diguida, @ianna, @cerminar, @Martin-Grunewald, @rcastello, @bendavid, @perrotta, @civanch, @vlimant, @cmsbuild, @fwyzard, @ktf, @davidlange6, @vciulli, @Dr15Jones, @mdhildreth, @rovere, @deguio, @slava77, @ggovi, @vadler, @ojeda, @mulhearn, @apfeiffer1, @nclopezo, @danduggan, @thuer, @monttj, @alja, @franzoni, @StoyanStoynev can you please review it and eventually sign? Thanks.
@ghellwig, @TaiSakuma, @abbiendi, @argiro, @jazzitup, @threus, @venturia, @pakhotin, @mmarionncern, @battibass, @acaudron, @lgray, @inugent, @yenjie, @ferencek, @cerati, @trocino, @rociovilar, @jpavel, @barvic, @wmtan, @GiacomoSguazzoni, @rovere, @VinInn, @bellan, @nhanvtran, @schoef, @richard-cms, @mandrenguyen, @wddgit, @alja, @dkotlins, @wmtford, @kurtejung, @gpetruc, @yetkinyilmaz, @pvmulder this is something you requested to watch as well.
You can sign-off by replying to this message having '+1' in the first line of your reply.
You can reject by replying to this message having '-1' in the first line of your reply.

ktf added a commit that referenced this pull request Aug 29, 2014
@ktf
Merge pull request #5108 from ktf/fix-root6-automerge
a4c4477 
Fix forward port CMSSW_7_2_ROOT6_X
@ktf ktf merged commit a4c4477 into cms-sw:CMSSW_7_2_ROOT6_X Aug 29, 2014
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
alca-pending analysis-pending comparison-pending core-pending db-pending dqm-pending generators-pending geometry-pending hlt-pending l1-pending operations-pending pending-signatures reconstruction-pending simulation-pending tests-pending visualization-pending
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet