[Rivet-svn] r3332 - in branches/2011-07-aida2yoda: . bin doc pyext

[blackhole at projects.hepforge.org]

Author: hoeth
Date: Thu Aug 25 12:13:03 2011
New Revision: 3332

Log:
merge r3325-3326 from trunk

Modified:
   branches/2011-07-aida2yoda/ChangeLog
   branches/2011-07-aida2yoda/bin/rivet
   branches/2011-07-aida2yoda/doc/mk-analysis-html
   branches/2011-07-aida2yoda/doc/mk-analysis-latex
   branches/2011-07-aida2yoda/doc/rivet-manual.tex
   branches/2011-07-aida2yoda/pyext/spiresbib.py

Modified: branches/2011-07-aida2yoda/ChangeLog
==============================================================================
--- branches/2011-07-aida2yoda/ChangeLog	Thu Aug 25 12:03:26 2011	(r3331)
+++ branches/2011-07-aida2yoda/ChangeLog	Thu Aug 25 12:13:03 2011	(r3332)
@@ -21,6 +21,8 @@
 
 	* Update CMS_2011_S8957746 reference data to the official numbers
 
+	* Use Inspire rather than Spires.
+
 2011-08-19  Frank Siegert <frank.siegert at cern.ch>
 
 	* More NLO parton level generator friendliness: Don't crash or fail when

Modified: branches/2011-07-aida2yoda/bin/rivet
==============================================================================
--- branches/2011-07-aida2yoda/bin/rivet	Thu Aug 25 12:03:26 2011	(r3331)
+++ branches/2011-07-aida2yoda/bin/rivet	Thu Aug 25 12:13:03 2011	(r3332)
@@ -278,7 +278,7 @@
         print "Status: %s" % ana.status()
         print ""
         print "Spires ID: %s" % ana.spiresId()
-        print "Spires URL:  http://www.slac.stanford.edu/spires/find/hep/www?rawcmd=key+%s" % ana.spiresId()
+        print "Inspire URL: http://inspire-hep.net/search?p=find+key+%s" % ana.spiresId()
         print "HepData URL: http://hepdata.cedar.ac.uk/view/irn%s" % ana.spiresId()
         coll = ""
         if ana.collider():

Modified: branches/2011-07-aida2yoda/doc/mk-analysis-html
==============================================================================
--- branches/2011-07-aida2yoda/doc/mk-analysis-html	Thu Aug 25 12:03:26 2011	(r3331)
+++ branches/2011-07-aida2yoda/doc/mk-analysis-html	Thu Aug 25 12:13:03 2011	(r3332)
@@ -60,7 +60,7 @@
     page += "<h3 id='%s'>%s</h3>\n" % (aname, aname)
     page += "<b>%s</b><br/>\n" %  ana.summary()
     page += "<b>Experiment:</b> %s (%s)<br/>\n" % (ana.experiment(), ana.collider())
-    spiresbase = "http://www.slac.stanford.edu/spires/find/hep/www?rawcmd=key"
+    spiresbase = "http://inspire-hep.net/search?p=find+key"
     page += "<b>Spires ID:</b> <a href='%s+%s'>%s</a><br/>\n" % \
         (spiresbase, ana.spiresId(), ana.spiresId())
     page += "<b>Status:</b> %s<br/>\n" % ana.status()

Modified: branches/2011-07-aida2yoda/doc/mk-analysis-latex
==============================================================================
--- branches/2011-07-aida2yoda/doc/mk-analysis-latex	Thu Aug 25 12:03:26 2011	(r3331)
+++ branches/2011-07-aida2yoda/doc/mk-analysis-latex	Thu Aug 25 12:13:03 2011	(r3332)
@@ -100,7 +100,7 @@
             page += " (%s)" % ana.collider()
         page += "\\newline\n"
     if ana.spiresId():
-        spiresbase = "http://www.slac.stanford.edu/spires/find/hep/www?rawcmd=key"
+        spiresbase = "http://inspire-hep.net/search?p=find+key"
         page += "\\textbf{Spires ID:} \\href{%s+%s}{%s}\\newline\n" % \
             (spiresbase, ana.spiresId(), ana.spiresId())
     page += "\\textbf{Status:} %s\\newline\n" % ana.status()

Modified: branches/2011-07-aida2yoda/doc/rivet-manual.tex
==============================================================================
--- branches/2011-07-aida2yoda/doc/rivet-manual.tex	Thu Aug 25 12:03:26 2011	(r3331)
+++ branches/2011-07-aida2yoda/doc/rivet-manual.tex	Thu Aug 25 12:13:03 2011	(r3332)
@@ -1208,7 +1208,7 @@
 \url{http://projects.hepforge.org/rivet/trac/wiki/}. The standard
 \kbd{rivet-mkanalysis} and \kbd{rivet-buildplugin} scripts can respectively be
 used to make an analysis template with many ``boilerplate'' details filled in
-(including bibliographic information from SPIRES if available), and to build a
+(including bibliographic information from Inspire if available), and to build a
 plugin library with the appropriate compiler options.
 
 

Modified: branches/2011-07-aida2yoda/pyext/spiresbib.py
==============================================================================
--- branches/2011-07-aida2yoda/pyext/spiresbib.py	Thu Aug 25 12:03:26 2011	(r3331)
+++ branches/2011-07-aida2yoda/pyext/spiresbib.py	Thu Aug 25 12:13:03 2011	(r3332)
@@ -11,7 +11,7 @@
 """
 
 def fetch_spires_bibtex(spiresid):
-    spiresurl = "http://www.slac.stanford.edu/spires/find/hep/www?key=%s&FORMAT=WWWBRIEFBIBTEX" % str(spiresid)
+    spiresurl = "http://inspire-hep.net/search?p=find+key+%s&of=hx" % str(spiresid)
     logging.debug("Downloading SPIRES BibTeX from %s" % spiresurl)
     hreq = urllib2.urlopen(spiresurl)
     bibtexhtml = hreq.read()
@@ -22,7 +22,7 @@
 
 def extract_bibtex(spireshtml):
     ## Extract BibTeX block from HTML
-    re_spiresbibtex = re.compile(r'<!-- START RESULTS -->.*?<pre>(.*?)</pre>', re.MULTILINE | re.DOTALL)
+    re_spiresbibtex = re.compile(r'<pre>(.*?)</pre>', re.MULTILINE | re.DOTALL)
     m = re_spiresbibtex.search(spireshtml)
     if m is None:
         return None, None