[Rivet] Fwd: [Rivet-svn] rivet: added missing metadata (mainly inspire IDs) to anainfos

[Andy Buckley]

Yes, I think small changes should go on the release branch, since we 
should have no problem with periodically merging the whole release 
branch on to the trunk/default.

As far as I'm concerned, this big merge can happen whenever someone 
feels like it, and I certainly don't think there's a responsiblity of 
committers on the release branch to immediately merge to trunk after 
every commit! More like the responsibility of trunk developers to 
periodically pull from release, since they're the ones who have to deal 
with the consequences of conflicts.

I have a feeling that hg doesn't allow merging of isolated changesets 
between branches, i.e. we can't selectively take minor changes from 
default on to the release branch. And anyway it would be better to not 
have to figure out which ones need that treatment.

Andy



On 06/08/15 14:25, Chris Pollard wrote:
> Hi all,
>
> I guess small changes like this could go into the release-2-3-x branch,
> no? What is the preferred way to make sure they go into the 2.3.X branch
> as well as default? I just made some bugfixes that are only on 2-3-x
> right now; should I merge that commit in from 2-3-x to default
> immediately, or should we wait to do a big merge at a later date?
>
> Chris
>
> ---------- Forwarded message ----------
> From: *Rivet Mercurial* <rivet at projects.hepforge.org
> <mailto:rivet at projects.hepforge.org>>
> Date: Thu, Aug 6, 2015 at 1:00 PM
> Subject: [Rivet-svn] rivet: added missing metadata (mainly inspire IDs)
> to anainfos
> To: rivet-svn at projects.hepforge.org <mailto:rivet-svn at projects.hepforge.org>
>
>
> details: https://rivet.hepforge.org/hg/rivet/rev/c6e4fd282c3e
> branches:
> changeset: 4833:c6e4fd282c3e
> user:      Lukas Heinrich <lukas.heinrich at gmail.com
> <mailto:lukas.heinrich at gmail.com>>
> date:      Thu Aug 06 12:45:00 2015 +0100
> description:
> added missing metadata (mainly inspire IDs) to anainfos
>
> diffs (truncated from 54 to 50 lines):
>
> --- a/data/anainfo/ATLAS_2012_I1112263.info     Wed Jul 29 23:23:27 2015
> +0100
> +++ b/data/anainfo/ATLAS_2012_I1112263.info     Thu Aug 06 12:45:00 2015
> +0100
> @@ -3,6 +3,7 @@
>   Summary: 3 lepton plus missing transverse energy SUSY search
>   Experiment: ATLAS
>   Collider: LHC
> +InspireID: 1112263
>   Status: VALIDATED
>   Authors:
>    - Peter Richardson <peter.richardson at durham.ac.uk
> <mailto:peter.richardson at durham.ac.uk>>
> --- a/data/anainfo/ATLAS_2012_I1117704.info     Wed Jul 29 23:23:27 2015
> +0100
> +++ b/data/anainfo/ATLAS_2012_I1117704.info     Thu Aug 06 12:45:00 2015
> +0100
> @@ -3,6 +3,7 @@
>   Summary: High jet multiplicity squark and gluino search
>   Experiment: ATLAS
>   Collider: LHC
> +InspireID: 1117704
>   Status: VALIDATED
>   Authors:
>    - Peter Richardson <peter.richardson at durham.ac.uk
> <mailto:peter.richardson at durham.ac.uk>>
> --- a/data/anainfo/ATLAS_2012_I1199269.info     Wed Jul 29 23:23:27 2015
> +0100
> +++ b/data/anainfo/ATLAS_2012_I1199269.info     Thu Aug 06 12:45:00 2015
> +0100
> @@ -9,6 +9,9 @@
>   RunInfo:
>     Inclusive diphoton $+ X$ events at $\sqrt{s} = 7$~TeV.
>   NumEvents: 1000000
> +Experiment: ATLAS
> +Collider: LHC
> +InspireID: 1199269
>   Beams: [p+, p+]
>   Energies: [7000]
>   PtCuts: [25, 22]
> --- a/data/anainfo/BELLE_2008_I786560.info      Wed Jul 29 23:23:27 2015
> +0100
> +++ b/data/anainfo/BELLE_2008_I786560.info      Thu Aug 06 12:45:00 2015
> +0100
> @@ -15,7 +15,7 @@
>     $e^+ e^-$ at the $\Upsilon(4S)$ resonance, with CoM boosts of
>     8.0 GeV~($e^-$) and 3.5~GeV~($e^+$)
>   NumEvents: 1000000
> -InSpireID: 786560
> +InspireID: 786560
>   Beams: [e+, e-]
>   Energies: [[3.5, 8.0]]
>   PtCuts: [0]
> --- a/data/anainfo/TOTEM_2012_I1115294.info     Wed Jul 29 23:23:27 2015
> +0100
> +++ b/data/anainfo/TOTEM_2012_I1115294.info     Thu Aug 06 12:45:00 2015
> +0100
> @@ -3,7 +3,7 @@
>   Summary: Forward $\mathrm{d}N/\mathrm{d}\eta$ at 7\;TeV
>   Experiment: TOTEM
>   Collider: LHC
> -#InspireID:
> _______________________________________________
> Rivet-svn mailing list
> Rivet-svn at projects.hepforge.org <mailto:Rivet-svn at projects.hepforge.org>
> https://www.hepforge.org/lists/listinfo/rivet-svn
>
>
>
> _______________________________________________
> Rivet mailing list
> Rivet at projects.hepforge.org
> https://www.hepforge.org/lists/listinfo/rivet
>


-- 
Dr Andy Buckley, Lecturer / Royal Society University Research Fellow
Particle Physics Expt Group, University of Glasgow