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

Zipped bank files compatibility #2785

Closed
wants to merge 740 commits into from
Closed

Zipped bank files compatibility #2785

wants to merge 740 commits into from

Conversation

sviret
Copy link
Contributor

@sviret sviret commented Mar 10, 2014

No description provided.

aledegano and others added 30 commits February 28, 2014 09:51
@aledegano
Merge pull request cms-sw#2520 from wmtan/DoNotMapEmptyProcessHistory…
484e8aa 
…ID62X

Configuration Fixes -- Don't try to update empty process history ID
@aledegano
Merge pull request cms-sw#2659 from fwyzard/TrackerMaterialAnalysis_6…
81f02cd 
…2x_v3

Simulation Fixes -- update the TrackerMaterialAnalysis package to CMSSW_6_2_X
Merged gem-sim-validation-for-gemsw from repository geonmo
1b022a1
@clacaputo
Info from GEMGeometry
1ae9752
@pmeridian
Working and debugged preliminary version
c995d4e
@pmeridian
fixing the EB/EE inversion
cbc88cc
@pmeridian
fixing the EB/EE inversion
62d4fe9
@cmsbuild
Merge pull request cms-sw#2657 from ianna/include-me0-in-2023-scenario
2b15c2b 
Include ME0, include extended pixel
@cmsbuild
Merge pull request cms-sw#2656 from bsunanda/Phase2-shashlik0
74c07ff 
Small change in ordering of supermodules
@pmeridian
Ok first merging. Have to change now the structure of the Upgrade wor…
affe2db 
…kflow
@clacaputo
booking ME update
0d62d03
@ianna
Fix overlaps. Reduce EE.
8cdd41e
@cmsbuild
Merge pull request cms-sw#2660 from sviret/TrackFindingAM_SV_270214
a47a468 
Track finding am sv 270214
@cmsbuild
Merge pull request cms-sw#2670 from boudoul/relval_620slhc8
a2fe1f6 
Relval 620slhc8
bugfix
080ccdc
clean-up
9cb65cb
@pmeridian
Updating for the new relval_steps code structure
370ffd7
@pmeridian
Merged time_digitization_for_SLHC9 from repository pmeridian
3ecaf05
@pmeridian
moving into single custom
f607ca9
@pmeridian
fixing relval configuration
c8188b2
@pmeridian
Merged time_digitization_for_CMSSW620_SLHC9 from repository pmeridian
1d10afa
@pmeridian
Working configuration
c3ba722
First version of SD class for Shashlik
5cccb10
@clacaputo
Fixed Geometry issues
ca74332
@bendavid
loosen lhe header compatibility check given that random seeds and num…
10f442c 
…ber of events may change from job to job for madevent and madspin
@bendavid
remove no-long-working workaround for amcatnlo event weights
d9d509e
@bendavid
add run script for amcatnlo tarballs
320501f
@pmeridian
First version of the sequence for localReco
c264e0d
@pmeridian
working reco. Missing z vertex correction
909a8d6
@ianna
Revert Tracker changes.
583fa1a
@sviret
Copy link
Contributor Author

sviret commented Mar 18, 2014

Tried to follow this tutorial to do the rebase:

http://cms-sw.github.io/cmssw/tutorial-forward-port.html

Using CMSSW_6_2_X_SLHC_2014-03-18-0200. However I get no conflict when I try to do the rebase, only the following errors:

error: addinfo_cache failed for path 'RecoMuon/MuonIdentification/plugins/ME0SegmentMatcher.h'
error: addinfo_cache failed for path 'RecoMuon/MuonIdentification/plugins/ME0SegmentMatcher.cc'
error: addinfo_cache failed for path 'RecoMuon/MuonIdentification/plugins/ME0MuonConverter.h'
error: addinfo_cache failed for path 'RecoMuon/MuonIdentification/plugins/ME0MuonConverter.cc'

Therefore I cannot push the new branch. Am I missing something?

@ktf
Copy link
Contributor

ktf commented Mar 18, 2014

They should be harmless. Please proceed with the push.

Ciao,
Giulio

On 18 Mar 2014, at 16:05, Seb Viret wrote:

Tried to follow this tutorial to do the rebase:

http://cms-sw.github.io/cmssw/tutorial-forward-port.html

Using CMSSW_6_2_X_SLHC_2014-03-18-0200. However I get no conflict when
I try to do the rebase, only the following errors:

error: addinfo_cache failed for path
'RecoMuon/MuonIdentification/plugins/ME0SegmentMatcher.h'
error: addinfo_cache failed for path
'RecoMuon/MuonIdentification/plugins/ME0SegmentMatcher.cc'
error: addinfo_cache failed for path
'RecoMuon/MuonIdentification/plugins/ME0MuonConverter.h'
error: addinfo_cache failed for path
'RecoMuon/MuonIdentification/plugins/ME0MuonConverter.cc'

Therefore I cannot push the new branch. Am I missing something?

Reply to this email directly or view it on GitHub:
#2785 (comment)

@cmsbuild
Copy link
Contributor

Pull request #2785 was updated. @diguida, @deguio, @lveldere, @ianna, @anton-a, @thspeer, @rcastello, @bendavid, @civanch, @ojeda, @vlimant, @cmsbuild, @ktf, @davidlange6, @vciulli, @Dr15Jones, @mdhildreth, @rovere, @giamman, @slava77, @Degano, @mulhearn, @nclopezo, @danduggan, @thuer, @franzoni can you please check and sign again.

@mark-grimes mark-grimes mentioned this pull request Mar 18, 2014
Merged
@mark-grimes
Copy link

@sviret, not sure what you rebased onto but this request still wants to change 439 files. I've opened #2913 with it on top of CMSSW_6_2_X_SLHC.

@mark-grimes
Copy link

@ktf please close this request

@ktf ktf closed this Mar 18, 2014
@mark-grimes
Copy link

No need to start anything again, I opened pull request #2913 with just your changes. Check that to make sure it has all the changes you wanted. I’m testing it at the moment and I’ll merge it soon if successful.

On 18 Mar 2014, at 17:33, Seb Viret notifications@github.com wrote:

OK, I will restart from scratch, will be much simpler I guess...

—
Reply to this email directly or view it on GitHub.

@sviret
Copy link
Contributor Author

sviret commented Mar 18, 2014

OK, 2913 looks fine for me

cmsbuild added a commit that referenced this pull request Mar 19, 2014
@cmsbuild
Merge pull request #2913 from mark-grimes/rebase2785
aeb68f0 
Rebase of pull request #2785
@sviret sviret deleted the TrackFindingAM_SV_100314 branch April 11, 2014 13:30
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 core-pending dqm-pending fastsim-pending generators-pending geometry-pending l1-pending new-package-pending operations-pending orp-pending pending-signatures reconstruction-pending simulation-pending tests-pending
Projects
None yet
Milestone
Next CMSSW_6_2_X_SLHC
Development

Successfully merging this pull request may close these issues.

None yet