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

Other packages -- changes for large object passed by value #627

Merged
merged 1 commit into from
Sep 12, 2013
Merged

Other packages -- changes for large object passed by value #627

merged 1 commit into from
Sep 12, 2013

Conversation

gartung
Copy link
Member

@gartung gartung commented Aug 27, 2013

found by clang static analyzer cms.ArgSizeChecker
std::vector
edm::ParamterSet

@cmsbuild
Copy link
Contributor

A new Pull Request was created by @gartung (Patrick Gartung) for CMSSW_7_0_X.

Other packages -- changes for large object passed by value

It involves the following packages:

ElectroWeakAnalysis/ZMuMu
IORawData/SiPixelInputSources
TopQuarkAnalysis/TopPairBSM
JetMETCorrections/TauJet
GeneratorInterface/ReggeGribovPartonMCInterface
GeneratorInterface/SherpaInterface
TrackingTools/MaterialEffects
EventFilter/Modules
MagneticField/VolumeBasedEngine
GeneratorInterface/LHEInterface
FastSimulation/TrackingRecHitProducer
DPGAnalysis/Skims
CommonTools/Utils
FastSimulation/L1CaloTriggerProducer
CommonTools/RecoAlgos
AnalysisDataFormats/TopObjects
FastSimDataFormats/L1GlobalMuonTrigger
EventFilter/StorageManager
CommonTools/Clustering1D
TauAnalysis/MCEmbeddingTools
EventFilter/SiPixelRawToDigi
GeneratorInterface/ExternalDecays
AnalysisDataFormats/TrackInfo

@vciulli, @civanch, @thspeer, @vlimant, @demattia, @franzoni, @mdhildred, @giamman, @slava77, @vadler, @fabiocos, @rcastello can you please review it and eventually sign? Thanks.
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.

@giamman
Copy link
Contributor

giamman commented Aug 27, 2013

+1

@slava77
Copy link
Contributor

slava77 commented Aug 27, 2013

working @slava77

@slava77
Copy link
Contributor

slava77 commented Aug 27, 2013

+1

Tested relative to the "baseline" = CMSSW_7_0_X_2013-08-26-1400

No changes observed in physics output as expected

@cmsbuild
Copy link
Contributor

The following categories have been signed by @slava77: Reconstruction

@cms-git-reconstruction

@demattia
Copy link
Contributor

+1

2 similar comments
@civanch
Copy link
Contributor

civanch commented Aug 27, 2013

+1

@vadler
Copy link

vadler commented Aug 27, 2013

+1

@cmsbuild
Copy link
Contributor

The following categories have been signed by @vadler: Analysis

@cms-git-analysis

@vciulli
Copy link
Contributor

vciulli commented Aug 30, 2013

I am trying to test this on CMSSW_7_0_X_2013-08-30-0200 but I got the following

[lxbuild169] /build/vciulli/CMSSW_7_0_X_2013-08-30-0200/src > git cms-merge-topic 627
No release tags specified, using default CMSSW_7_0_X_2013-08-30-0200.
You are on branch CMSSW_7_0_X
Checking out FWCore/Version in tag CMSSW_7_0_X_2013-08-30-0200.
From .

  • [new ref] -> merge-attempt
    From https://github.com/cms-sw/cmssw
  • [new ref] refs/pull/627/head -> cms-sw/refs/pull/627/head
    Switched to branch 'merge-attempt'
    error: addinfo_cache failed for path 'SimCalorimetry/HcalZeroSuppressionProducers/doc/HcalZeroSuppressionProducers.doc'
    CONFLICT (modify/delete): EventFilter/StorageManager/interface/DataSenderMonitorCollection.h deleted in HEAD and modified in cms-sw/refs/pull/627/head. Version cms-sw/refs/pull/627/head of EventFilter/StorageManager/interface/DataSenderMonitorCollection.h left in tree.
    CONFLICT (modify/delete): EventFilter/Modules/src/FUShmOutputModule.h deleted in HEAD and modified in cms-sw/refs/pull/627/head. Version cms-sw/refs/pull/627/head of EventFilter/Modules/src/FUShmOutputModule.h left in tree.
    CONFLICT (modify/delete): EventFilter/Modules/src/FUShmOutputModule.cc deleted in HEAD and modified in cms-sw/refs/pull/627/head. Version cms-sw/refs/pull/627/head of EventFilter/Modules/src/FUShmOutputModule.cc left in tree.
    Automatic merge failed; fix conflicts and then commit the result.
    Unable to merge branch refs/pull/627/head from repository cms-sw.

I guess these files have been changed in between the pull and the new IB.
What can I do?

Vitalinao

On Aug 27, 2013, at 04:44, cmsbuild wrote:

A new Pull Request was created by @gartung (Patrick Gartung) for CMSSW_7_0_X.

Other packages -- changes for large object passed by value

It involves the following packages:

ElectroWeakAnalysis/ZMuMu
IORawData/SiPixelInputSources
TopQuarkAnalysis/TopPairBSM
JetMETCorrections/TauJet
GeneratorInterface/ReggeGribovPartonMCInterface
GeneratorInterface/SherpaInterface
TrackingTools/MaterialEffects
EventFilter/Modules
MagneticField/VolumeBasedEngine
GeneratorInterface/LHEInterface
FastSimulation/TrackingRecHitProducer
DPGAnalysis/Skims
CommonTools/Utils
FastSimulation/L1CaloTriggerProducer
CommonTools/RecoAlgos
AnalysisDataFormats/TopObjects
FastSimDataFormats/L1GlobalMuonTrigger
EventFilter/StorageManager
CommonTools/Clustering1D
TauAnalysis/MCEmbeddingTools
EventFilter/SiPixelRawToDigi
GeneratorInterface/ExternalDecays
AnalysisDataFormats/TrackInfo

@vciulli, @civanch, @thspeer, @vlimant, @demattia, @franzoni, @mdhildred, @giamman, @slava77, @vadler, @fabiocos, @rcastello can you please review it and eventually sign? Thanks.
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.

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

@gartung
Copy link
Member Author

gartung commented Aug 30, 2013

I can attempt a merge from HEAD to remove those files, but that will reset all signatures. Giulio should I continue?

@slava77
Copy link
Contributor

slava77 commented Aug 30, 2013

Just FYI, it was only a minor problem for me, I just ended up testing the change incrementally with
respect to your parent commit e448454.
Now I see that Vitaliano has a more complicated problem.

@gartung
Copy link
Member Author

gartung commented Aug 30, 2013

Rebased to CMSSW_7_0_0_pre3 and removed three files that caused merge conflict.

@cmsbuild
Copy link
Contributor

Pull request #627 was updated. Signatures reset, please check and sign again.

@slava77
Copy link
Contributor

slava77 commented Aug 30, 2013

Hi Patrick,

Why are these three files now showing up as removed in the diffstats?
https://github.com/cms-sw/cmssw/pull/627/files
The complete directory EventFilter/Modules is removed now in the head. Maybe rebasing to 700pre3 brings some confusion because of that?

@gartung
Copy link
Member Author

gartung commented Aug 30, 2013

On 8/30/2013 9:52 AM, slava77 wrote:

Hi Patrick,

Why are these three files now showing up as removed in the diffstats?
https://github.com/cms-sw/cmssw/pull/627/files
The complete directory EventFilter/Modules is removed now in the head.
Maybe rebasing to 700pre3 brings some confusion because of that?

—
Reply to this email directly or view it on GitHub
#627 (comment).

Oh FUBAR. I removed those files by hard and then rebased. Let me try
rebasing without removing the files first.

@gartung
Copy link
Member Author

gartung commented Aug 30, 2013

On 8/30/2013 9:52 AM, slava77 wrote:

Hi Patrick,

Why are these three files now showing up as removed in the diffstats?
https://github.com/cms-sw/cmssw/pull/627/files
The complete directory EventFilter/Modules is removed now in the head.
Maybe rebasing to 700pre3 brings some confusion because of that?

—
Reply to this email directly or view it on GitHub
#627 (comment).

Rebased to CMSSW_7_0_X.

@cmsbuild
Copy link
Contributor

Pull request #627 was updated. Signatures reset, please check and sign again.

@giamman
Copy link
Contributor

giamman commented Aug 30, 2013

+1

3 similar comments
@demattia
Copy link
Contributor

+1

@vadler
Copy link

vadler commented Aug 30, 2013

+1

@civanch
Copy link
Contributor

civanch commented Aug 30, 2013

+1

@slava77
Copy link
Contributor

slava77 commented Sep 11, 2013

working @slava77

@slava77
Copy link
Contributor

slava77 commented Sep 11, 2013

+1

retested in CMSSW_7_0_X_2013-09-10-0200
no diffs

@ktf
Copy link
Contributor

ktf commented Sep 12, 2013

I think Vitaliano is on holidays, so I'm just bypassing his signature since this is pretty technical...

ktf added a commit that referenced this pull request Sep 12, 2013
@ktf
Merge pull request #627 from gartung/argsize-Misc
eba4146 
Other packages -- changes for large object passed by value
@ktf ktf merged commit eba4146 into cms-sw:CMSSW_7_0_X Sep 12, 2013
gpetruc added a commit to gpetruc/cmssw that referenced this pull request Apr 18, 2016
@gpetruc
Merge pull request cms-sw#627 from peruzzim/heppy_76X_works260116_reb…
cc72a03 
…ased

Heppy: b-tag reweight and smaller improvements
nadya-chernyavskaya pushed a commit to nadya-chernyavskaya/cmssw that referenced this pull request Jan 17, 2017
@arizzi
Merge pull request cms-sw#627 from cvernier/pfid-moriond17
f8f9c96 
fix PFID and btagWP
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-approved analysis-approved fastsim-approved generators-pending operations-pending pending-signatures reconstruction-approved simulation-approved
Projects
None yet
Milestone
CMSSW_7_0_0_pre4
Development

Successfully merging this pull request may close these issues.
9 participants
@gartung @cmsbuild @giamman @slava77 @demattia @civanch @vadler @vciulli @ktf