[Rivet-svn] r4026 - branches/2012-06-aidarivet/bin branches/2012-06-aidarivet/src/Analyses trunk/bin trunk/src/Analyses

[blackhole at projects.hepforge.org]

Author: fsiegert
Date: Fri Nov 16 14:54:19 2012
New Revision: 4026

Log:
two fixes for systems with older compiler/python (SL5)

Modified:
   branches/2012-06-aidarivet/bin/rivet-mkanalysis
   branches/2012-06-aidarivet/src/Analyses/ATLAS_2012_CONF_2012_105.cc
   trunk/bin/rivet-mkanalysis
   trunk/src/Analyses/ATLAS_2012_CONF_2012_105.cc

Modified: branches/2012-06-aidarivet/bin/rivet-mkanalysis
==============================================================================
--- branches/2012-06-aidarivet/bin/rivet-mkanalysis	Thu Nov 15 17:27:07 2012	(r4025)
+++ branches/2012-06-aidarivet/bin/rivet-mkanalysis	Fri Nov 16 14:54:19 2012	(r4026)
@@ -87,11 +87,15 @@
         ANAYEAR = match.group(2)
         INSPIRE_SPIRES = match.group(3)
         ANAINSPIREID = match.group(4)
+    if INSPIRE_SPIRES == "S":
+        ANAREFREPO = "Spires"
+    else:
+        ANAREFREPO = "Inspire"
     KEYWORDS = {
         "ANANAME" : ANANAME,
         "ANAEXPT" : ANAEXPT,
         "ANAYEAR" : ANAYEAR,
-        "ANAREFREPO" : "Spires" if INSPIRE_SPIRES == "S" else "Inspire",
+        "ANAREFREPO" : ANAREFREPO,
         "ANAINSPIREID" : ANAINSPIREID
         }
 

Modified: branches/2012-06-aidarivet/src/Analyses/ATLAS_2012_CONF_2012_105.cc
==============================================================================
--- branches/2012-06-aidarivet/src/Analyses/ATLAS_2012_CONF_2012_105.cc	Thu Nov 15 17:27:07 2012	(r4025)
+++ branches/2012-06-aidarivet/src/Analyses/ATLAS_2012_CONF_2012_105.cc	Fri Nov 16 14:54:19 2012	(r4026)
@@ -169,7 +169,7 @@
       if ( recon_leptons.size() != 2) vetoEvent;
       // ensure 1st hardest
       if(recon_leptons[0].momentum().perp()<recon_leptons[1].momentum().perp())
-	swap(recon_leptons[0],recon_leptons[1]);
+        std::swap(recon_leptons[0],recon_leptons[1]);
       // only keep same sign
       if(recon_leptons[0].pdgId()*recon_leptons[1].pdgId()<0)
 	vetoEvent;

Modified: trunk/bin/rivet-mkanalysis
==============================================================================
--- trunk/bin/rivet-mkanalysis	Thu Nov 15 17:27:07 2012	(r4025)
+++ trunk/bin/rivet-mkanalysis	Fri Nov 16 14:54:19 2012	(r4026)
@@ -87,11 +87,15 @@
         ANAYEAR = match.group(2)
         INSPIRE_SPIRES = match.group(3)
         ANAINSPIREID = match.group(4)
+    if INSPIRE_SPIRES == "S":
+        ANAREFREPO = "Spires"
+    else:
+        ANAREFREPO = "Inspire"
     KEYWORDS = {
         "ANANAME" : ANANAME,
         "ANAEXPT" : ANAEXPT,
         "ANAYEAR" : ANAYEAR,
-        "ANAREFREPO" : "Spires" if INSPIRE_SPIRES == "S" else "Inspire",
+        "ANAREFREPO" : ANAREFREPO,
         "ANAINSPIREID" : ANAINSPIREID
         }
 

Modified: trunk/src/Analyses/ATLAS_2012_CONF_2012_105.cc
==============================================================================
--- trunk/src/Analyses/ATLAS_2012_CONF_2012_105.cc	Thu Nov 15 17:27:07 2012	(r4025)
+++ trunk/src/Analyses/ATLAS_2012_CONF_2012_105.cc	Fri Nov 16 14:54:19 2012	(r4026)
@@ -169,7 +169,7 @@
       if ( recon_leptons.size() != 2) vetoEvent;
       // ensure 1st hardest
       if(recon_leptons[0].momentum().perp()<recon_leptons[1].momentum().perp())
-        swap(recon_leptons[0],recon_leptons[1]);
+        std::swap(recon_leptons[0],recon_leptons[1]);
       // only keep same sign
       if(recon_leptons[0].pdgId()*recon_leptons[1].pdgId()<0)
         vetoEvent;