Porting to git unreleased EGamma changes.

[beaudett]

Porting the following tagset which was committed in CVS but not published.

RecoEgamma/EgammaElectronAlgos V02-00-00
DataFormats/EgammaCandidates v08-00-00
Validation/RecoEgamma V08-00-03
RecoEgamma/EgammaElectronProducers V01-42-00
RecoParticleFlow/PFProducer V17-01-09

In addition,
CommonTools/ParticleFlow/python/EITopPAG_cff.py
has been changed to match the changes.

[nclopezo]

Hi,

The file:
HLTriggerOffline/Tau/python/Validation/init.pyc should not be included

And there seems to be conflicts in the files:
DataFormats/EgammaCandidates/interface/Photon.h
Validation/RecoEgamma/plugins/PhotonValidator.cc

Could you please resolve the conflicts and update the pull request?
Thanks.

[beaudett]

Hello,

I wish I could answer you by mail, but the mail I received doesn't give your email address nor your real name.

About
HLTriggerOffline/Tau/python/Validation/init.pyc
It has been created automatically; and I haven't realized that it had been committed. By the way, I thought that git had been configured in order not to commit those files. Anyway, can you tell how to remove these files ?

Could you please tell me what conflicts you are seeing and how to reproduce the error message ? I haven't seen any conflict and "runTheMatrix" was working just fine.

Thanks
Florian

[beaudett]

Hello again,

for the first problem, I think "git rm" did the job.

About the second one, it seems that indeed the same changes have been
centrally.
However, in my local area, if I do:
git diff official-cmssw/CMSSW_7_0_X -- interface/Photon.h
diff --git a/DataFormats/EgammaCandidates/interface/Photon.h
b/DataFormats/EgammaCandidates/interface/Photon.h
index 09f1ede..ba167b8 100644
--- a/DataFormats/EgammaCandidates/interface/Photon.h
+++ b/DataFormats/EgammaCandidates/interface/Photon.h
@@ -7,7 +7,7 @@

• stores isolation, shower shape and additional info

• needed for identification
  *

  • * \version $Id: Photon.h,v 1.48 2012/03/26 16:44:27 nancy Exp $
  • * \version $Id: Photon.h,v 1.49 2013/06/05 16:37:06 nancy Exp $
    *
    */
    #include "DataFormats/RecoCandidate/interface/RecoCandidate.h"
    @@ -409,6 +409,8 @@ namespace reco {
    float chargedHadronIso() const {return
    pfIsolation_.chargedHadronIso;}
    float neutralHadronIso() const {return
    pfIsolation_.neutralHadronIso;}
    float photonIso() const {return pfIsolation_.photonIso;}
  • float modFrixione() const {return pfIsolation_.modFrixione;}

  /// Set Particle Flow Isolation variables
  void setPflowIsolationVariables ( const PflowIsolationVariables&
  pfisol ) { pfIsolation_ = pfisol;}

I don't see any problem.
Is it possible that these changes have been put in afterwards. Has it
been done between CMSSW_7_0_0_pre0 and an integration build ? How can I
know ? What I have to do now is way beyond my current knowledge of git
and I would appreciate some help.
Thanks
Florian

On 18/7/13 2:45 PM, nclopezo wrote:

Hi,

The file:
HLTriggerOffline/Tau/python/Validation/init.pyc should not be included

And there seems to be conflicts in the files:
DataFormats/EgammaCandidates/interface/Photon.h
Validation/RecoEgamma/plugins/PhotonValidator.cc

Could you please resolve the conflicts and update the pull request?
Thanks.

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

[nclopezo]

Hi,

You can just reply directly to the email and github will show it here. Thanks for noticing, I added my name and email to my github profile.

About HLTriggerOffline/Tau/python/Validation/init.pyc I just saw that you removed it and committed the change

You can run

scram p CMSSW_7_0_X_2013-07-18-0200
cd CMSSW_7_0_X_2013-07-17-1400/
cmsenv
git cms-merge-topic 120

And git cms-merge-topic will complain about the conflicts.

If you run

cd src
git status

It will show you the two files that have conflicts. If you open these files, you can see the conflicts marked cvs style.

[beaudett]

Hi David,

thanks for the prompt answer. I have one short practical question.
On which infrastructures does CMSSW_7_0_X_2013-07-18-0200 exist ? I
can't find it on my scl5 box nor on the default slc6 lxplus ?

F.

On 18/7/13 3:17 PM, David Mendez wrote:

Hi,

You can just reply directly to the email and github will show it here.
Thanks for noticing, I added my name and email to my github profile.

About HLTriggerOffline/Tau/python/Validation/init.pyc I just saw
that you removed it and committed the change

You can run

scram p CMSSW_7_0_X_2013-07-18-0200
cd CMSSW_7_0_X_2013-07-17-1400/
cmsenv
git cms-merge-topic 120

And git cms-merge-topic will complain about the conflicts.

If you run

cd src
git status

It will show you the two files that have conflicts. If you open these
files, you can see the conflicts marked cvs style.

If you open the files the conflicts are

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

[nclopezo]

Hi,

You can use slc5_amd64_gcc472.

On Thu, Jul 18, 2013 at 3:26 PM, beaudett notifications@github.com wrote:

Hi David,

thanks for the prompt answer. I have one short practical question.
On which infrastructures does CMSSW_7_0_X_2013-07-18-0200 exist ? I
can't find it on my scl5 box nor on the default slc6 lxplus ?

F.

On 18/7/13 3:17 PM, David Mendez wrote:

Hi,

You can just reply directly to the email and github will show it here.
Thanks for noticing, I added my name and email to my github profile.

About HLTriggerOffline/Tau/python/Validation/init.pyc I just saw
that you removed it and committed the change

You can run

scram p CMSSW_7_0_X_2013-07-18-0200
cd CMSSW_7_0_X_2013-07-17-1400/
cmsenv
git cms-merge-topic 120

And git cms-merge-topic will complain about the conflicts.

If you run

cd src
git status

It will show you the two files that have conflicts. If you open these
files, you can see the conflicts marked cvs style.

If you open the files the conflicts are

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

—
Reply to this email directly or view it on GitHubhttps://github.com//pull/120#issuecomment-21182786
.

David Mendez

[beaudett]

Hi David,

thanks.

I have several questions. The conflicts are quite trivial. Indeed,
essentially I was trying to put some changes which had already been put
in, and there is just one line like this:
\version $Id: Photon.h,v 1.47 2012/03/21 22:11:05 slava77 Exp $
which was different.

I have two options:

1. I can edit by hand and remove the line, but then how can I make sure
   that I won't have an other conflict because I left a space or removed
   one extra empty line ?
   git diff does not give much information:

git diff Validation/RecoEgamma/plugins/PhotonValidator.cc
diff --cc Validation/RecoEgamma/plugins/PhotonValidator.cc
index 7944aaf,936c49e..0000000
--- a/Validation/RecoEgamma/plugins/PhotonValidator.cc
+++ b/Validation/RecoEgamma/plugins/PhotonValidator.cc

In other words, how can I check that there won't be any conflict
beforehand ? I tried:
git diff official-cmssw/CMSSW_7_0_X-07-18-0200 --
Validation/RecoEgamma/plugins/PhotonValidator.cc
but it doesn't work. While
git diff official-cmssw/CMSSW_7_0_X --
Validation/RecoEgamma/plugins/PhotonValidator.cc
works. I am quite puzzled.

2. other option, probably cleaner: how can I tell GIT to ignore my
   changes in the two files
   DataFormats/EgammaCandidates/interface/Photon.h
   Validation/RecoEgamma/plugins/PhotonValidator.cc

As you can see, I am still in the learning phase, so if you could take
the time to answer 1) & 2) it would be very useful to me.

Thanks
Florian

On 18/7/13 3:41 PM, David Mendez wrote:

Hi,

You can use slc5_amd64_gcc472.

[beaudett]

Hi,

less /afs/cern.ch/user/d/dmendezl/Public/unitTests.log
/afs/cern.ch/user/d/dmendezl/Public/unitTests.log: Permission denied

I suspect it comes from EITopPAG_cff

Can you check you have these changes ?
beaudett@1b6c72b

Thanks
Florian

On 19/7/13 5:03 PM, David Mendez wrote:

Hi Florian,

Thanks, it has no conflicts anymore. However, when I take these changes
on CMSSW_7_0_X_2013-07-19-0200
and then I run the unit tests I get some errors:

---> test runtestTqafTopHitFit had ERRORS
---> test runtestTqafTopEventSelection had ERRORS
---> test runtestTqafTopEventProducers had ERRORS
---> test runtestTqafTopTools had ERRORS
---> test runtestTqafExamples had ERRORS
---> test runtestTqafTopJetCombination had ERRORS
---> test runtestTqafTopKinFitter had ERRORS

You an get the log for the unit tests in
/afs/cern.ch/user/d/dmendezl/Public/unitTests.log

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

[deguio]

is this wanted?
@beaudett

[deguio]

hello @beaudett,
I fear you are overwriting the last updates from nancy which entered in 620:
http://cmssw.cvs.cern.ch/cgi-bin/cmssw.cgi/CMSSW/Validation/RecoEgamma/?sortby=date&pathrev=V08-00-02-04
and are already included in CMSSW_7_0_X

could you merge them and submit the pull request ID 120 again?
thanks!

[beaudett]

Hello,

indeed, after a few iterations with David last Friday, I realized that I
had been trying to overwrite the changes from Nancy.
That's why I tried to revert them, and according to David, the conflict
is no longer there; but we hit an other problem.
I don't know if you had a chance to look at the whole thread here:
#120

Cheers,
Florian

On 21/7/13 4:51 PM, deguio wrote:

hello @beaudett https://github.com/beaudett,
I fear you are overwriting the last updates from nancy which entered in 620:
http://cmssw.cvs.cern.ch/cgi-bin/cmssw.cgi/CMSSW/Validation/RecoEgamma/?sortby=date&pathrev=V08-00-02-04
and are already included in CMSSW_7_0_X

could you merge them and submit the pull request ID 120 again?
thanks!

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

[deguio]

hello,
thanks for your answer. I think that the following files should be reverted back to the nancy's version also:
Validation/RecoEgamma/python/egammaValidation_cff.py
Validation/RecoEgamma/plugins/PhotonPostprocessing.cc

Am I wrong? I will wait for a message from you to test again and approve the pull request 120.
thanks,
F.

[beaudett]

Hello,

it is quite likely. That's too bad that after two long threads on these
changes in June, when both Nancy and I spent quite a lot of time, I
haven't been informed that this porting was taking place.
I am wasting even more time, and, in addition, I am wasting yours and
David's.

That said, I think you are right. Should I do the same as for other
files on Friday or are you taking care of it ?

Thanks
Florian

On 21/7/13 5:12 PM, deguio wrote:

hello,
thanks for your answer. I think that the following files should be
reverted back to the nancy's version also:
Validation/RecoEgamma/python/egammaValidation_cff.py
Validation/RecoEgamma/plugins/PhotonPostprocessing.cc

Am I wrong? I will wait for a message from you to test again and approve
the pull request 120.
thanks,
F.

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

[deguio]

if you confirm that the rest of the packages are in their final version I can take care of this tomorrow.
I would revert:
Validation/RecoEgamma/python/egammaValidation_cff.py
Validation/RecoEgamma/plugins/PhotonPostprocessing.cc

test everything and sign the pull request.
cheers,
F.

[beaudett]

Hi,

to the best of my knowledge, yes, they are in their final version.

Thanks
Florian

On 21/7/13 5:29 PM, deguio wrote:

if you confirm that the rest of the packages are in their final version
I can take care of this tomorrow.
cheers,
F.

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

[cmsbuild]

The following categories have been rejected by @deguio: DQM

@cms-git-dqm

[nclopezo]

Superseded by 156