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

Merge 70X into 71X #3013

Merged
merged 59 commits into from Mar 25, 2014
Merged

Merge 70X into 71X #3013

merged 59 commits into from Mar 25, 2014

Conversation

ktf
Copy link
Contributor

@ktf ktf commented Mar 25, 2014

No description provided.

mtosi and others added 30 commits February 4, 2014 17:04
@mtosi
Merged hlttracking-parabolic-mf-build-fit from repository tropiano
e2bfe59
@mtosi
add MagneticField_38T_PostLS1_cff
5878f09
@mtosi
synchronize code w/ new updates committed in 71x [EventSetupRecord::g…
efe0352 
…et(ESInputTag const& iTag, HolderT& iHolder)]. Next step update cfis in order to make them back-compatible
@mtosi
adjust config files and make them back-compatible and make new parame…
a07252c 
…ters available (above all for confDB)
@perrotta
Fix conflicts.
b4880a1
@makortel @perrotta
Move SeedingLayerSetsHits to TrackingTools/TransientTrackingRecHit
7bc0826 
In order to avoid a package with only one class. SeedingLayerSetsHits
can be thought as a very specialized container of
TransientTrackingRecHits.
@perrotta
Merged seedingLayersFor70X from repository perrotta
d4d1e0e
@perrotta
Adjust GRun configuration for FastSim
9388e0e
@perrotta
Merged seedingLayersFor70X from repository perrotta
fed78d8
@makortel @perrotta
Use std::unique_ptr for all helper objects creted in PixelTrackRecons…
ca7065c 
…truction constructor
@mtosi
get rid of ESInputTag
2108814
@perrotta
Merged seedingLayersFor70X from repository perrotta
1cd463a
@perrotta
Move the HLT configs to the 7_1_0_pre3 template. as in cms-sw#2640
92aef9c
@perrotta
Merged CMSSW_7_0_X from repository cms-sw
b5dc831
@perrotta
Merged seedingLayersFor70X from repository perrotta
dbcb9ce
@perrotta
Revert last commit
7228f22
@perrotta
Revert last (but one) commit
09cd334
@VinInn @perrotta
mosslty inline, removed runtime debug, some float2double
ea3a350
@VinInn @perrotta
made a vector
749a377
@VinInn @perrotta
more inline, loop moved in algo
9b860e5
@VinInn @perrotta
no CRC
d29eb19
@VinInn @perrotta
move to plugin
de845fa
@VinInn @perrotta
move to plugin
494e1e6
@VinInn @perrotta
add final
ceb6043
@VinInn @perrotta
a bit faster on noise
5786cee
@VinInn @perrotta
prefetch
d28edd9
@VinInn @perrotta
clusterizer caches connected detid and offsets in calibrations
f7ab100
@VinInn @perrotta
access conditions by position
17c7882
@VinInn @perrotta
remove assert
8208c39
@VinInn @perrotta
use logwarning
33bff1a
VinInn and others added 18 commits March 6, 2014 10:32
@VinInn @perrotta
compatible with on demand: size the index
b3d04dc
@VinInn @perrotta
reset index
68a1a97
@VinInn @perrotta
fixed state flags ready,empty,read, to be cleanup
98b41b6
@VinInn @perrotta
make detset relocable, fix swap, FIXME: reco config is now onDemand...
ec5050e
@VinInn @perrotta
fix empty detset
a5fdf34
@VinInn @perrotta
back to standard production config
80facff
@VinInn @perrotta
fix iterator
67d32f7
@VinInn @perrotta
replace error for a debug
a6e0fe0
@VinInn @perrotta
add a new ClusterRemover for HLT. FIXME a lot of cout at the moment
6e7a393
@VinInn @perrotta
fix charge cut
500a6b5
@VinInn @perrotta
add not update interface, test it
39c5a46
@VinInn @perrotta
comment warning: maybe move to debug?
3d4f4f4
@VinInn @perrotta
remove ALL debug
65b6390
@VinInn @perrotta
protect against zero good detid
7366f3b
@ktf
Merge pull request cms-sw#2410 from mtosi/mtosi/from-CMSSW_7_0_0_pre1…
b0669c7 
…2_hlttracking-parabolic-mf-build-fit

Reco -- Parametrized magnetic field availability in tracking modules
@ktf
Merge pull request cms-sw#2728 from perrotta/seedingLayersFor70X
5edcbe7 
HLT request -- Seeding layers for70 x
@ktf
Merge pull request cms-sw#2746 from perrotta/stripClustersBackTo70X
da8c157 
Reco speedup -- Strip clusters back to 70X
@ktf
Merge remote-tracking branch 'cms-sw/CMSSW_7_0_X' into foo
e3fd1d9 
Conflicts:
	RecoTracker/IterativeTracking/python/PixelLessTripletStep_cff.py
	RecoTracker/IterativeTracking/python/PostLS1_PixelLessTripletStep_cff.py
	RecoTracker/IterativeTracking/python/PostLS1_TobTecHybridStep_cff.py
	RecoTracker/IterativeTracking/python/TobTecHybridStep_cff.py
@cmsbuild
Copy link
Contributor

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

Merge 70X into 71X

It involves the following packages:

RecoTracker/CkfPattern
RecoTracker/IterativeTracking
RecoTracker/TkNavigation
RecoTracker/TkSeedGenerator
TrackingTools/KalmanUpdators
TrackingTools/MaterialEffects

@nclopezo, @cmsbuild, @anton-a, @thspeer, @slava77, @Degano can you please review it and eventually sign? Thanks.
@ghellwig, @GiacomoSguazzoni, @rovere, @gpetruc, @cerati, @venturia 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.
@nclopezo, @ktf you are the release manager for this.
You can merge this pull request by typing 'merge' in the first line of your comment.

@cmsbuild
Copy link
Contributor

+1
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-3013/646/summary.html

ktf added a commit that referenced this pull request Mar 25, 2014
@ktf
Merge pull request #3013 from ktf/fix-CMSSW_7_1_X
c09ee0a 
Merge 70X into 71X
@ktf ktf merged commit c09ee0a into cms-sw:CMSSW_7_1_X Mar 25, 2014
@ktf ktf deleted the fix-CMSSW_7_1_X branch March 25, 2014 20:25
@makortel makortel mentioned this pull request Apr 24, 2023
Open
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
pending-signatures reconstruction-pending tests-approved
Projects
None yet
Milestone
CMSSW_7_1_0_pre5
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@ktf @cmsbuild @mtosi @perrotta @makortel @VinInn