|
[Rivet-svn] r3820 - in trunk: . binblackhole at projects.hepforge.org blackhole at projects.hepforge.orgThu Jul 12 19:00:33 BST 2012
Author: buckley Date: Thu Jul 12 19:00:33 2012 New Revision: 3820 Log: Fix rivet-mkanalysis a bit for YODA compatibility. Modified: trunk/ChangeLog trunk/bin/rivet-mkanalysis Modified: trunk/ChangeLog ============================================================================== --- trunk/ChangeLog Wed Jul 11 17:38:35 2012 (r3819) +++ trunk/ChangeLog Thu Jul 12 19:00:33 2012 (r3820) @@ -1,3 +1,7 @@ +2012-07-12 Andy Buckley <andy.buckley at cern.ch> + + * Fix rivet-mkanalysis a bit for YODA compatibility. + 2012-07-03 Hendrik Hoeth <hendrik.hoeth at cern.ch> * Bugfix for transverse mass (thanks to Gavin Hesketh) Modified: trunk/bin/rivet-mkanalysis ============================================================================== --- trunk/bin/rivet-mkanalysis Wed Jul 11 17:38:35 2012 (r3819) +++ trunk/bin/rivet-mkanalysis Thu Jul 12 19:00:33 2012 (r3820) @@ -1,7 +1,7 @@ #! /usr/bin/env python """\ -%prog: make templates of analysis source files for Rivet" +%prog: make templates of analysis source files for Rivet Usage: %prog [--help|-h] [--srcroot=<srcrootdir>] <analysisname> @@ -113,19 +113,19 @@ KEYWORDS["ANABIBTEX"] = ANABIBTEX - ## Try do download AIDA data file from hepdata + ## Try to download YODA data file from HepData if STDANA: try: import urllib - hdurl = "http://hepdata.cedar.ac.uk/view/irn%s/aida" % ANAINSPIREID + hdurl = "http://hepdata.cedar.ac.uk/view/irn%s/yoda" % ANAINSPIREID logging.debug("Getting data file from HepData at %s" % hdurl) httpstream = urllib.urlopen(hdurl) - aidastr = httpstream.read() - if "<html>" in aidastr: + yodastr = httpstream.read() + if "<html>" in yodastr: logging.warning("Problem encountered when getting data from HepData (%s). No reference data file written." % hdurl) else: - f = open("%s.aida" % ANANAME, "w") - f.write(aidastr) + f = open("%s.yoda" % ANANAME, "w") + f.write(yodastr) f.close() httpstream.close() except Exception, e: @@ -139,7 +139,6 @@ string experiment() const { return "%(ANAEXPT)s"; } string year() const { return "%(ANAYEAR)s"; } string %(ANAREFREPO_LOWER)sId() const { return "%(ANAINSPIREID)s"; } - string spiresId() const { return "%(ANASPIRESID)s"; } string collider() const { return ""; } string summary() const { return ""; } string description() const { return ""; } @@ -198,7 +197,7 @@ /// @todo Book histograms here, e.g.: // _h_XXXX = bookProfile1D(1, 1, 1); - // _h_YYYY = bookHistogram1D(2, 1, 1); + // _h_YYYY = bookHisto1D(2, 1, 1); } @@ -234,8 +233,8 @@ /// @name Histograms //@{ - AIDA::IProfile1D *_h_XXXX; - AIDA::IHistogram1D *_h_YYYY; + Profile1DPtr _h_XXXX; + Histogram1DPtr _h_YYYY; //@} %(INLINEMETHODS)s
More information about the Rivet-svn mailing list |