Last version

[simoneg90]

Added the Pi0 stream - cff file in the python folder, DummyRecHit in the plugin folder with the Exception procedure when a recHit subDetId is >1.
Added the LoneBunch trigger - only in the HighPileUp cfg file (possible to use it or not - option='lonBunch')
Added infoTree in the Analyzer before the cut to do studies of chi2 and energy cuts dependence

[previsualconsent]

It seems like this commit
"last version update" simoneg90@0a70102

has a lot of the changes that I made. Which makes this merge really confusing

[emanueledimarco]

where is the problem? Does it conflict when merging?

[previsualconsent]

it makes the history very messy, but I am working on merging it.
If you want to update your code, then a git pull should be done, so the
history makes sense.

On Fri, Oct 9, 2015 at 3:31 PM, Emanuele Di Marco notifications@github.com
wrote:

where is the problem? Does it conflict when merging?

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

[previsualconsent]

there will always be some conflicts with merging, the problem is not
combining our code more periodically, so there is quite a bit of divering

On Fri, Oct 9, 2015 at 4:14 PM, Peter Hansen previsualconsent@gmail.com
wrote:

it makes the history very messy, but I am working on merging it.
If you want to update your code, then a git pull should be done, so the
history makes sense.

On Fri, Oct 9, 2015 at 3:31 PM, Emanuele Di Marco <
notifications@github.com> wrote:

where is the problem? Does it conflict when merging?

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

[simoneg90]

Of course this commit simoneg90/EcalTiming@0a70102 has a lot of your changes...we agreed to use the same code and to unify the analysis, so you passed me your version and I copied it in mine
The only differences are the one listed in the pull request comments (just a typo...the option is 'loneBunch' not 'lonBunch'). We can scan the code together this afternoon (your morning) to see the differences and decide what to merge.

[previsualconsent]

I know, the point of using git though, is to simplify that process. I think
I was able to do most of the merge yesterday. I'm busy this afternoon but
I'll finish it before monday.

On Sat, Oct 10, 2015 at 12:52 AM, simoneg90 notifications@github.com
wrote:

Of course this commit simoneg90/EcalTiming@0a70102
simoneg90@0a70102 has a lot of
your changes...we agreed to use the same code and to unify the analysis, so
you passed me your version and I copied it in mine
The only differences are the one listed in the pull request comments (just
a typo...the option is 'loneBunch' not 'lonBunch'). We can scan the code
together this afternoon (your morning) to see the differences and decide
what to merge.

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

[shervin86]

Superseeded by PR #9