[Rivet-svn] r3759 - branches/2011-07-aida2yoda/bin

[blackhole at projects.hepforge.org]

Author: hoeth
Date: Fri Jun  8 15:33:43 2012
New Revision: 3759

Log:
merge c3725-3728, 3730, 3741 from trunk

Added:
   branches/2011-07-aida2yoda/bin/rivet-findid
      - copied, changed from r3730, trunk/bin/rivet-findid
Modified:
   branches/2011-07-aida2yoda/bin/Makefile.am

Modified: branches/2011-07-aida2yoda/bin/Makefile.am
==============================================================================
--- branches/2011-07-aida2yoda/bin/Makefile.am	Fri Jun  8 15:31:49 2012	(r3758)
+++ branches/2011-07-aida2yoda/bin/Makefile.am	Fri Jun  8 15:33:43 2012	(r3759)
@@ -9,7 +9,7 @@
     rivet \
     rivet-mkanalysis rivet-buildplugin \
     rivet-chopbins rivet-rmgaps rivet-rescale \
-    rivet-mergeruns rivet-mkhtml
+    rivet-mergeruns rivet-mkhtml rivet-findid
 
 if ENABLE_PYEXT
 dist_bin_SCRIPTS += $(RIVETPROGS)

Copied and modified: branches/2011-07-aida2yoda/bin/rivet-findid (from r3730, trunk/bin/rivet-findid)
==============================================================================
--- trunk/bin/rivet-findid	Thu May 17 13:12:40 2012	(r3730, copy source)
+++ branches/2011-07-aida2yoda/bin/rivet-findid	Fri Jun  8 15:33:43 2012	(r3759)
@@ -13,6 +13,8 @@
                 - SPIRES:  [S]nnnnnnn
                 - Inspire: [I]nnnnnn[n]"""
 
+import re
+
 try:
     import xml.etree.cElementTree as ET
 except ImportError:
@@ -38,11 +40,8 @@
 
 
     ## Set up some variables before the loop over args
-    import re
     arxiv_pattern = re.compile('^\d\d[01]\d\.\d{4}$|^(hep-(ex|ph|th)|nucl-ex)/\d\d[01]\d{4}$')
     spires_pattern = re.compile('^(S|I)?(\d{6}\d?)$')
-    import rivet
-    ALL_ANALYSES = rivet.AnalysisLoader.analysisNames()
 
 
     ## Loop over requested IDs
@@ -141,6 +140,8 @@
 
 def try_rivet(id):
     id = re.compile(id)
+    import rivet
+    ALL_ANALYSES = rivet.AnalysisLoader.analysisNames()
     return filter(id.search, ALL_ANALYSES)