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

Jump to bottom

Merge pf migration #2928

Merged
merged 174 commits into from Mar 21, 2014
Merged

Merge pf migration #2928

merged 174 commits into from Mar 21, 2014

Conversation

ktf
Copy link
Contributor

@ktf ktf commented Mar 19, 2014

No description provided.

vkuznet and others added 30 commits November 1, 2013 14:18
@vkuznet
Thread safe changes
84d3f83
Applied patch https://twiki.cern.ch/twiki/pub/CMS/TkAlignmentLegacyTh…
dcf3b40 
…oughts/hierarchyConstr.patch
@pvmulder
added new tagging variables and new version of CombinedSVComputer
dd2901c
@pvmulder
minor fixes
3c2bfc7
@pvmulder
combined CSVV2+SL tagger
a9250c1
@pvmulder
changes needed or combined CSVV2_SL tagger
6e37c56
@pvmulder
if-else instead of ifs and removing the unneeded exception
77a2108
@venturia
New configuration for APVCyclePhaseProducerFromL1TS to be used for da…
e50bed0 
…ta collected after Nov 2nd, 2012
@beaudett
restore class definition using PF information
4458279
@mtosi
conversion EDAnalyzer --> DQMEDAnalyzer
6e5095c
@mtosi
conversion EDAnalyzer --> DQMEDAnalyzer
8fd9f99
Implement and use the new interface of RecoCaloTools/Selectors.
6ae9f38 
MetaCollections are no longer used (replaced with edm::SortedCollection),
additionally users can pass a callback function/lambda to a selector and avoid building a collection altogether.
Make FastSimulation not dependant on MetaCollections.
59e149a
Make DQMOffline/Trigger not dependant on MetaCollections.
521218a
TauAnalysis/MCEmbeddingTools/CaloRecHitMixer no longer requires EcalR…
4c4717d 
…ecHit to inherit from CaloRecHit.
RecoJets/JetProducers/JetMatchingTools no longer requires EcalRecHit …
83a8398 
…to inherit from CaloRecHit.

The JetMatchingTools now use struct with {detid, energy} instead of a pointer to *RecHit.
Adding GT for CSA14 optimistic scenario (aka 25ns).
7177f24 
Signed-off-by: Salvatore Di Guida <salvatore.di.guida@cern.ch>
RecoLocalCalo/CaloTowersCreator/CaloTowersCreationAlgo no longer requ…
6ab2a07 
…ires EcalRecHit to inherit from CaloRecHit.
EgammaCoreTools now uses EcalRecHit.checkFlag() instead of the deprec…
374ca6c 
…reted recoFlag().
Calibration/HcalCalibAlgos/GammaJetAnalysis no longer requires EcalRe…
fc95ac9 
…cHit to inherit from CaloRecHit.
Removal of MetaCollections and switching to a new EcalRecHit (no inhe…
5f2e0b5 
…ritance from CaloRecHit).
@venturia
Added the possibility to monitor SiStripAPVPhaseOffsets tags
ab1d0f7
@bachtis @Martin-Grunewald
Adding new hits
92a7f62
@bachtis @Martin-Grunewald
cleaning old code
e44523d
@bachtis @Martin-Grunewald
Changed RecHit
df5ebb9
@bachtis @Martin-Grunewald
Removing stuff
9cf2615
@bachtis @Martin-Grunewald
fixing also the hash
75b8cd7
@bachtis @Martin-Grunewald
Added forgotten file
d25da46
@bachtis @Martin-Grunewald
Caching the 4 and 8 neighbours"
fc9de23
@lgray @Martin-Grunewald
skeleton of PFClusterProducer Refactorization
b2230ac
ktf and others added 10 commits March 14, 2014 22:21
@ktf
Merge pull request cms-sw#2869 from hvanhaev/parameter-cleanup
6adf8fe 
Reco -- Castor consumes migrations + Parameter cleanup
@wmtan
String returned by value must be stored
6379dd1
@ktf
Merge pull request cms-sw#2828 from gartung/clang-work-fix
829fdf3 
ClassChecker should only check data classes. Script to extract ESD class...
@ktf
Merge pull request cms-sw#2845 from davidlange6/static_Var_fixes_v2
b09da1f 
MT -- Removing use of statics in reco
@ktf
Merge pull request cms-sw#2866 from lgray/pfcluster_rebuild_morecoder…
a649877 
…eview

Reco -- Further code review from the end of cms-sw#2730
@nclopezo
Merge pull request cms-sw#2872 from beaudett/class-fix
d3d90b2 
RecoEgamma/EgammaElectronAlgos -- restore class definition using PF information
@nclopezo
Merge pull request cms-sw#2858 from bachtis/consumesPF
bd94f60 
RecoParticleFlow -- Consumes Migration for Particle Flow
@nclopezo
Merge pull request cms-sw#2844 from dr4kan/GlobalTT_to_consumes
71873e9 
RecoMuon -- migration to "consumes" of RecoMuon/GlobalTrackingTools
@ktf
Merge pull request cms-sw#2877 from wmtan/FixForValgrindInvalidRead
c39d1f5 
Valgrind fix -- String returned by value must be stored
@ktf
Merge remote-tracking branch 'origin/CMSSW_7_1_X' into foo
59d7af9 
Conflicts:
	RecoParticleFlow/PFRootEvent/BuildFile.xml
	RecoParticleFlow/PFRootEvent/interface/PFRootEventManager.h
@ktf
Copy link
Contributor Author

ktf commented Mar 19, 2014

@wmtan The recently merged new PF stuff broke the automatic merging of ROOT6 IBs into CMSSW_7_1_ROOT6_X, this is the merge done by hand. Any objections to merge it in? Notice it includes a bunch of pull requests which we merged afterwards.

@cmsbuild
Copy link
Contributor

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

Merge pf migration

It involves the following packages:

CalibTracker/SiPixelLorentzAngle
Calibration/HcalCalibAlgos
CondCore/CondDB
CondCore/DBOutputService
CondCore/Utilities
CondFormats/JetMETObjects
Configuration/Applications
Configuration/EventContent
Configuration/StandardSequences
DQM/SiStripMonitorSummary
DQM/TrackingMonitor
DQMOffline/Trigger
DataFormats/BTauReco
DataFormats/EcalRecHit
DataFormats/ParticleFlowReco
DataFormats/TrackerCommon
EventFilter/CastorRawToDigi
EventFilter/RPCRawToDigi
FWCore/Framework
FWCore/Services
FWCore/Utilities
FastSimulation/EgammaElectronAlgos
FastSimulation/Muons
HLTrigger/Configuration
JetMETCorrections/MCJet
MuonAnalysis/MomentumScaleCalibration
PhysicsTools/MVAComputer
PhysicsTools/PatAlgos
RecoBTag/SecondaryVertex
RecoBTag/SoftLepton
RecoCaloTools/MetaCollections
RecoCaloTools/Selectors
RecoEcal/EgammaCoreTools
RecoEgamma/EgammaElectronAlgos
RecoEgamma/EgammaElectronProducers
RecoEgamma/EgammaHLTProducers
RecoEgamma/EgammaIsolationAlgos
RecoEgamma/EgammaPhotonProducers
RecoEgamma/EgammaTools
RecoEgamma/PhotonIdentification
RecoHI/HiEgammaAlgos
RecoHI/HiMuonAlgos
RecoJets/JetPlusTracks
RecoJets/JetProducers
RecoLocalCalo/CaloRecCandCreator
RecoLocalCalo/CaloTowersCreator
RecoLocalCalo/EcalRecAlgos
RecoLocalCalo/HcalRecAlgos
RecoMuon/GlobalMuonProducer
RecoMuon/GlobalTrackFinder
RecoMuon/GlobalTrackingTools
RecoMuon/L3TrackFinder
RecoMuon/TrackerSeedGenerator
RecoParticleFlow/Configuration
RecoParticleFlow/PFClusterProducer
RecoParticleFlow/PFProducer
RecoParticleFlow/PFRootEvent
RecoParticleFlow/PFTracking
SimCalorimetry/EcalSelectiveReadoutProducers
SimGeneral/DataMixingModule
SimGeneral/MixingModule
TauAnalysis/MCEmbeddingTools
Utilities/ReleaseScripts
Utilities/StaticAnalyzers
Validation/RecoEgamma

@diguida, @deguio, @lveldere, @Martin-Grunewald, @anton-a, @thspeer, @rcastello, @perrotta, @civanch, @ojeda, @vlimant, @cmsbuild, @fwyzard, @ktf, @davidlange6, @Dr15Jones, @mdhildreth, @rovere, @giamman, @slava77, @ggovi, @vadler, @Degano, @apfeiffer1, @nclopezo, @danduggan, @monttj, @franzoni can you please review it and eventually sign? Thanks.
@ghellwig, @TaiSakuma, @yslai, @argiro, @venturia, @frmeier, @ferencek, @cerati, @mandrenguyen, @yetkinyilmaz, @wmtan, @GiacomoSguazzoni, @rovere, @nhanvtran, @mmusich, @richard-cms, @MiheeJo, @jazzitup, @yenjie, @kurtejung, @pvmulder, @bachtis 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.

@perrotta
Copy link
Contributor

Please merge further with the (already integrated in 71X) #2914: it includes all the features you need in HLTrigger/Configuration for this PF migration, plus the more recent ones which have been integrated afterwards. (Otherwise it will be unmergeable in 71X).

@ktf
Copy link
Contributor Author

ktf commented Mar 20, 2014

@wmtan, are you ok with this? notice that until we merge this, the ROOT6 IBs will not automatically merge 71X anymore.

@wmtan
Copy link
Contributor

wmtan commented Mar 21, 2014

Please merge. Bill

ktf added a commit that referenced this pull request Mar 21, 2014
@ktf
Merge pull request #2928 from ktf/merge-pf-migration
ff908a9 
Merge pf migration
@ktf ktf merged commit ff908a9 into cms-sw:CMSSW_7_1_ROOT6_X Mar 21, 2014
@ktf ktf deleted the merge-pf-migration branch March 21, 2014 19:57
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 core-pending db-pending dqm-pending fastsim-pending hlt-pending operations-pending pending-signatures reconstruction-pending simulation-pending tests-pending
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet