<html> <head> <meta content="text/html; charset=utf-8" http-equiv="Content-Type"> </head> <body bgcolor="#FFFFFF" text="#000000"> I think I did it again. I now have these two heads: <blockquote>changeset: 5552:83766679b782 branch: release-2-5-x tag: tip parent: 5549:0ee33b1e451c user: Holger Schulz <a class="moz-txt-link-rfc2396E" href="mailto:holger.schulz@durham.ac.uk"><holger.schulz@durham.ac.uk></a> date: Mon Oct 03 14:23:02 2016 +0100 summary: 3 more inspireID fixes changeset: 5551:7181e7acdc1a branch: release-2-5-x parent: 5548:118748e0a78f user: David Grellscheid <a class="moz-txt-link-rfc2396E" href="mailto:david.grellscheid@durham.ac.uk"><david.grellscheid@durham.ac.uk></a> date: Mon Oct 03 14:19:40 2016 +0100 summary: correct 2-5-x head after mismerge </blockquote> This is what the glog looks like: <blockquote>@ changeset: 5552:83766679b782 | branch: release-2-5-x | tag: tip | parent: 5549:0ee33b1e451c | user: Holger Schulz <a class="moz-txt-link-rfc2396E" href="mailto:holger.schulz@durham.ac.uk"><holger.schulz@durham.ac.uk></a> | date: Mon Oct 03 14:23:02 2016 +0100 | summary: 3 more inspireID fixes | | o changeset: 5551:7181e7acdc1a | | branch: release-2-5-x | | parent: 5548:118748e0a78f | | user: David Grellscheid <a class="moz-txt-link-rfc2396E" href="mailto:david.grellscheid@durham.ac.uk"><david.grellscheid@durham.ac.uk></a> | | date: Mon Oct 03 14:19:40 2016 +0100 | | summary: correct 2-5-x head after mismerge | | +---_ changeset: 5550:89f572acaa99 | | branch: release-2-5-x | | user: David Grellscheid <a class="moz-txt-link-rfc2396E" href="mailto:david.grellscheid@durham.ac.uk"><david.grellscheid@durham.ac.uk></a> | | date: Mon Oct 03 14:18:42 2016 +0100 | | summary: closed mis-merge | | o | changeset: 5549:0ee33b1e451c |\| branch: release-2-5-x | | parent: 5548:118748e0a78f | | parent: 5547:c258d1504036 | | user: Holger Schulz <a class="moz-txt-link-rfc2396E" href="mailto:holger.schulz@durham.ac.uk"><holger.schulz@durham.ac.uk></a> | | date: Mon Oct 03 13:46:32 2016 +0100 | | summary: Merge </blockquote> I am definitely on the 2-5-x branch. I don't know what to do now. Holger <div class="moz-cite-prefix">On 03/10/16 14:21, David Grellscheid wrote: </div> <blockquote cite="mid:e124c6ca-31c3-2d7b-63af-24b2ebec557a@durham.ac.uk" type="cite">OK, sorted. David On 03/10/2016 14:14, David Grellscheid wrote: <blockquote type="cite">Hi Holger, I think you mis-merged just now. We do not want trunk features on the release branch. I'll sort this out. David On 03/10/2016 14:00, Rivet Mercurial wrote: <blockquote type="cite">details: <a class="moz-txt-link-freetext" href="https://rivet.hepforge.org/hg/rivet/rev/0ee33b1e451c">https://rivet.hepforge.org/hg/rivet/rev/0ee33b1e451c</a> branches: release-2-5-x changeset: 5549:0ee33b1e451c user: Holger Schulz <a class="moz-txt-link-rfc2396E" href="mailto:holger.schulz@durham.ac.uk"><holger.schulz@durham.ac.uk></a> date: Mon Oct 03 13:46:32 2016 +0100 description: Merge diffs (truncated from 845 to 50 lines): --- a/configure.ac Mon Oct 03 13:44:52 2016 +0100 +++ b/configure.ac Mon Oct 03 13:46:32 2016 +0100 @@ -1,7 +1,7 @@ ## Process this file with autoconf to produce a configure script. AC_PREREQ(2.59) -AC_INIT([Rivet],[2.5.2],[<a class="moz-txt-link-abbreviated" href="mailto:rivet@projects.hepforge.org">rivet@projects.hepforge.org</a>],[Rivet]) +AC_INIT([Rivet],[trunk],[<a class="moz-txt-link-abbreviated" href="mailto:rivet@projects.hepforge.org">rivet@projects.hepforge.org</a>],[Rivet]) ## Check and block installation into the src/build dir if test "$prefix" = "$PWD"; then --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/data/anainfo/MC_CENTRALITY.info Mon Oct 03 13:46:32 2016 +0100 @@ -0,0 +1,10 @@ +Name: MC_CENTRALITY +Summary: Template analysis for using CentralityHistogram +Status: UNVALIDATED +Authors: + - Leif Lönnblad <a class="moz-txt-link-rfc2396E" href="mailto:leif.lonnblad@thep.lu.se"><leif.lonnblad@thep.lu.se></a> +NumEvents: 50000 +RunInfo: Any! +Description: + Template analysis for using CentralityHistogram for dynamically + determining centrality intervals using summed eT in the forward region. --- a/data/anainfo/Makefile.am Mon Oct 03 13:44:52 2016 +0100 +++ b/data/anainfo/Makefile.am Mon Oct 03 13:46:32 2016 +0100 @@ -310,6 +310,7 @@ LHCB_2014_I1281685.info \ LHCB_2015_I1333223.info \ LHCF_2012_I1115479.info \ + MC_CENTRALITY.info \ MC_DIPHOTON.info \ MC_ELECTRONS.info \ MC_GENERIC.info \ --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/data/plotinfo/MC_CENTRALITY.plot Mon Oct 03 13:46:32 2016 +0100 @@ -0,0 +1,72 @@ +# BEGIN PLOT /MC_CENTRALITY/ETfwd +Title=Sum $E_T$ distribution +XLabel=$\sum E_T$ +YLabel=$1/\sigma \; \mathrm{d}\sigma/\mathrm{d}\sum E_T$ +# END PLOT + +# BEGIN PLOT /MC_CENTRALITY/EtaAll +Title=Charged pseudo-rapidity distribution +XLabel=$\eta$ +YLabel=$1/\sigma \; \mathrm{d}\sigma/\mathrm{d}\eta$ +# END PLOT + +# BEGIN PLOT /MC_CENTRALITY/EtaC95 _______________________________________________ Rivet-svn mailing list <a class="moz-txt-link-abbreviated" href="mailto:Rivet-svn@projects.hepforge.org">Rivet-svn@projects.hepforge.org</a> <a class="moz-txt-link-freetext" href="https://www.hepforge.org/lists/listinfo/rivet-svn">https://www.hepforge.org/lists/listinfo/rivet-svn</a> </blockquote> </blockquote> _______________________________________________ Rivet mailing list <a class="moz-txt-link-abbreviated" href="mailto:Rivet@projects.hepforge.org">Rivet@projects.hepforge.org</a> <a class="moz-txt-link-freetext" href="https://www.hepforge.org/lists/listinfo/rivet">https://www.hepforge.org/lists/listinfo/rivet</a> </blockquote> </body> </html>