[Rivet-svn] r3556 - in trunk: . bin

[blackhole at projects.hepforge.org]

Author: buckley
Date: Tue Feb 14 15:21:34 2012
New Revision: 3556

Log:
bin/rivet: Remove the conversion of requested analysis names to upper-case: mixed-case analysis names will now work.

Modified:
   trunk/ChangeLog
   trunk/bin/rivet

Modified: trunk/ChangeLog
==============================================================================
--- trunk/ChangeLog	Tue Feb 14 14:34:24 2012	(r3555)
+++ trunk/ChangeLog	Tue Feb 14 15:21:34 2012	(r3556)
@@ -1,4 +1,10 @@
+2012-02-14  Andy Buckley  <andy.buckley at cern.ch>
+
+	* bin/rivet: Remove the conversion of requested analysis names to
+	upper-case: mixed-case analysis names will now work.
+
 2012-02-14  Frank Siegert  <frank.siegert at cern.ch>
+
 	* Bugfixes and improvements for MC_TTBAR:
 	  - Avoid assert failure with logspace starting at 0.0
 	  - Ignore charged lepton in jet finding (otherwise jet multi is always

Modified: trunk/bin/rivet
==============================================================================
--- trunk/bin/rivet	Tue Feb 14 14:34:24 2012	(r3555)
+++ trunk/bin/rivet	Tue Feb 14 15:21:34 2012	(r3556)
@@ -414,16 +414,16 @@
 # if opts.ALL_ANALYSES:
 #     opts.ANALYSES = all_analyses
 for a in opts.ANALYSES:
-    a_up = a.upper()
+    #a_up = a.upper()
     ## Print warning message and exit if not a valid analysis name
-    if not a_up in all_analyses:
-        logging.warning("'%s' is not a valid analysis. Available analyses are:" % a_up)
+    if not a in all_analyses:
+        logging.warning("'%s' is not a valid analysis. Available analyses are:" % a)
         for aa in all_analyses:
             logging.warning("    %s" % aa)
         logging.warning("Exiting...")
         sys.exit(1)
-    logging.debug("Adding analysis '%s'" % a_up)
-    ah.addAnalysis(a_up)
+    logging.debug("Adding analysis '%s'" % a)
+    ah.addAnalysis(a)
 
 ## Read and process events
 run = rivet.Run(ah)