|
[Rivet] [Rivet-svn] r3899 - branches/2012-06-aidarivet/binFrank Siegert frank.siegert at cern.chWed Aug 22 19:30:05 BST 2012
Hi Andy, Sorry, you're right, I didn't commit to trunk. Back when the branch splitting happened, I asked Hendrik whether it's more convenient if we commit to both branches simultaneously or let him merge stuff in a batch, and he said either is fine with him. So if that hasn't changed I'll let Hendrik merge this together with any other changes that need merging. About the YODA push: I won't be in Durham any time soon, but I'm definitely available for an online meeting about the next steps. Do you want to set up a Doodle for some dates once you are available again? Cheers, Frank On 22 August 2012 17:48, Andy Buckley <andy.buckley at ed.ac.uk> wrote: > Hi Frank, > > Has this also been fixed on the trunk? I didn't see an SVN notification > about that, but maybe it was already solved. > > Until the trunk is released, we need to make sure that any improvements > that aren't specific to the new developments or their old equivalents > get applied both to the 1.8.x ("AIDA") branch and the trunk. > > We should also arrange to make a development push on the missing > YODA/head features soon -- August is never a good month to start these > things, and I certainly have no time until the start of September, but > maybe we can either meet in person or online to decide what needs to be > done. Writing a tool for YODA file run-merging and testing that the > design in that respect is sound, and updating/replacing the > compare-histos and format converter scripts are the main blockers, I > think, as well as completing the migration of the few remaining > incomplete analyses. Anything that I'm forgetting? > > Cheers, > Andy > > > On 21/08/12 15:52, blackhole at projects.hepforge.org wrote: >> Author: fsiegert >> Date: Tue Aug 21 15:52:04 2012 >> New Revision: 3899 >> >> Log: >> Bugfix in rivet-mkhtml for inspireid >> >> Modified: >> branches/2012-06-aidarivet/bin/rivet-mkhtml >> >> Modified: branches/2012-06-aidarivet/bin/rivet-mkhtml >> ============================================================================== >> --- branches/2012-06-aidarivet/bin/rivet-mkhtml Mon Aug 20 10:33:29 2012 (r3898) >> +++ branches/2012-06-aidarivet/bin/rivet-mkhtml Tue Aug 21 15:52:04 2012 (r3899) >> @@ -265,7 +265,7 @@ >> index.write('\n<h3><a href="%s/index.html" style="text-decoration:none;">%s</a></h3>\n' % (analysis, _htmlify(summary))) >> reflist = [] >> if inspireid and inspireid !="NONE": >> - reflist.append('<a href="http://inspirehep.net/record/%s">Spires</a>' % spiresid) >> + reflist.append('<a href="http://inspirehep.net/record/%s">Spires</a>' % inspireid) >> elif spiresid and spiresid != "NONE": >> reflist.append('<a href="http://durpdg.dur.ac.uk/cgi-bin/spiface/hep/www?irn+%s">Spires</a>' % spiresid) >> reflist += references >> @@ -284,7 +284,7 @@ >> (opts.OUTPUTDIR, analysis, style)) >> anaindex.write('<h3>%s</h3>\n' % analysis) >> anaindex.write('<p><a href="../index.html">Back to index</a></p>\n') >> - anaindex.write('<p>\n %s\n</p>\n' % _htmlify(summary)) >> + anaindex.write('<p>\n %s\n</p>\n' % _htmlify(description)) >> else: >> anaindex = index >> >> _______________________________________________ >> Rivet-svn mailing list >> Rivet-svn at projects.hepforge.org >> http://www.hepforge.org/lists/listinfo/rivet-svn >> > > > -- > Dr Andy Buckley, SUPA Advanced Research Fellow > Particle Physics Expt Group, University of Edinburgh > > The University of Edinburgh is a charitable body, registered in > Scotland, with registration number SC005336. > > _______________________________________________ > Rivet mailing list > Rivet at projects.hepforge.org > http://www.hepforge.org/lists/listinfo/rivet
More information about the Rivet mailing list |