[Rivet-svn] r4157 - in trunk: data data/refdata src/Analyses

[blackhole at projects.hepforge.org]

Author: hoeth
Date: Thu Feb 14 13:45:30 2013
New Revision: 4157

Log:
merge c4071-4073 from branches/2012-06-aidarivet

Modified:
   trunk/data/refdata/ALEPH_2001_S4656318.aida   (props changed)
   trunk/data/refdata/ALEPH_2002_S4823664.aida   (props changed)
   trunk/data/refdata/ARGUS_1993_S2653028.aida   (props changed)
   trunk/data/refdata/ARGUS_1993_S2669951.aida   (props changed)
   trunk/data/refdata/ARGUS_1993_S2789213.aida   (props changed)
   trunk/data/refdata/ATLAS_2011_S9212183.aida   (props changed)
   trunk/data/refdata/ATLAS_2012_I1082009.aida   (props changed)
   trunk/data/refdata/BABAR_2005_S6181155.aida   (props changed)
   trunk/data/refdata/BABAR_2007_S6895344.aida   (props changed)
   trunk/data/refdata/BELLE_2001_S4598261.aida   (props changed)
   trunk/data/refdata/DELPHI_1999_S3960137.aida   (props changed)
   trunk/data/refdata/DELPHI_2000_S4328825.aida   (props changed)
   trunk/data/refdata/OPAL_1994_S2927284.aida   (props changed)
   trunk/data/refdata/OPAL_1995_S3198391.aida   (props changed)
   trunk/data/refdata/OPAL_1996_S3257789.aida   (props changed)
   trunk/data/refdata/OPAL_1997_S3396100.aida   (props changed)
   trunk/data/refdata/OPAL_1997_S3608263.aida   (props changed)
   trunk/data/refdata/OPAL_1998_S3702294.aida   (props changed)
   trunk/data/refdata/OPAL_1998_S3749908.aida   (props changed)
   trunk/data/refdata/OPAL_2000_S4418603.aida   (props changed)
   trunk/data/refdata/OPAL_2002_S5361494.aida   (props changed)
   trunk/data/refdata/SLD_1996_S3398250.aida   (props changed)
   trunk/data/refdata/SLD_2002_S4869273.aida   (props changed)
   trunk/data/refdata/SLD_2004_S5693039.aida   (props changed)
   trunk/data/rivet-completion
   trunk/src/Analyses/ATLAS_2011_I894867.cc

Modified: trunk/data/rivet-completion
==============================================================================
--- trunk/data/rivet-completion	Thu Feb 14 13:43:05 2013	(r4156)
+++ trunk/data/rivet-completion	Thu Feb 14 13:45:30 2013	(r4157)
@@ -28,25 +28,23 @@
         fi
     fi
 
-    if test -x "$(which rivet 2> /dev/null)"; then
-        anas=$(rivet --list-analyses)
-        if (echo ${prev} | egrep -- "\<-a\>|\<--analysis\>|\<--show-analysis\>|\<--list-analyses\>" &> /dev/null); then
-            COMPREPLY=( $(compgen -W "$anas" -- ${cur}) )
-            return 0
-        fi
+    if (echo ${prev} | egrep -- "-\<a\>|--\<analysis\>|--\<show-analysis\>|--\<list-analyses\>" &> /dev/null); then
+        anas=$(rivet --list-analyses --quiet)
+        COMPREPLY=( $(compgen -W "$anas" -- ${cur}) )
+        return 0
     fi
 
-    if (echo ${prev} | egrep -- "\<-n\>|\<--nevts\>|\<--runname\>|\<--histo-interval\>|\<--cross-section\>|\<-x\>|\<--event-timeout\>" &> /dev/null); then
+    if (echo ${prev} | egrep -- "\<-n\>|--\<nevts\>|--\<runname\>|--\<histo-interval\>|--\<cross-section\>|\<-x\>|--\<event-timeout\>" &> /dev/null); then
         COMPREPLY=()
         return 0
     fi
 
-    if (echo ${prev} | egrep -- "\<--histo-file\>|\<-H\>" &> /dev/null); then
+    if (echo ${prev} | egrep -- "--\<histo-file\>|\<-H\>" &> /dev/null); then
         _filedir aida
         return 0
     fi
 
-    if (echo ${prev} | egrep -- "\<--analysis-path\>|\<--analysis-path-append\>" &> /dev/null); then
+    if (echo ${prev} | egrep -- "--\<analysis-path\>|--\<analysis-path-append\>" &> /dev/null); then
         _filedir -d
         return 0
     fi
@@ -196,17 +194,17 @@
     fi
 
     ## Options with files / directories as the arg
-    if (echo ${prev} | egrep -- "\<--outputdir\>|\<-o\>" &> /dev/null); then
+    if (echo ${prev} | egrep -- "--\<outputdir\>|\<-o\>" &> /dev/null); then
         _filedir -d
         return 0
     fi
-    if (echo ${prev} | egrep -- "\<--config\>|\<-c\>" &> /dev/null); then
+    if (echo ${prev} | egrep -- "--\<config\>|\<-c\>" &> /dev/null); then
         _filedir
         return 0
     fi
 
     ## Options without an completeable arg
-    if (echo ${prev} | egrep -- "\<-t\>|\<--title\>|\<--refid\>|\<--n\>|\<--num-threads\>|\<-m\>|\<--match\>|\<-M\>|\<--unmatch\>" &> /dev/null); then
+    if (echo ${prev} | egrep -- "\<-t\>|--\<title\>|--\<refid\>|--\<n\>|--\<num-threads\>|\<-m\>|--\<match\>|\<-M\>|--\<unmatch\>" &> /dev/null); then
         COMPREPLY=()
         return 0
     fi

Modified: trunk/src/Analyses/ATLAS_2011_I894867.cc
==============================================================================
--- trunk/src/Analyses/ATLAS_2011_I894867.cc	Thu Feb 14 13:43:05 2013	(r4156)
+++ trunk/src/Analyses/ATLAS_2011_I894867.cc	Thu Feb 14 13:45:30 2013	(r4157)
@@ -45,26 +45,26 @@
         }
       }
 
-    FourMomentum MxFourVector(0.,0.,0.,0.);
-    FourMomentum MyFourVector(0.,0.,0.,0.);
+      FourMomentum MxFourVector(0.,0.,0.,0.);
+      FourMomentum MyFourVector(0.,0.,0.,0.);
 
-    foreach(const Particle& p, fs.particlesByEta()) {
-      if (p.momentum().eta() > gapcenter) {
-        MxFourVector += p.momentum();
-      } else {
-        MyFourVector += p.momentum();
+      foreach(const Particle& p, fs.particlesByEta()) {
+        if (p.momentum().eta() > gapcenter) {
+          MxFourVector += p.momentum();
+        } else {
+          MyFourVector += p.momentum();
+        }
       }
-    }
 
-    double Mx2 = FourMomentum(MxFourVector).mass2();
-    double My2 = FourMomentum(MyFourVector).mass2();
+      double Mx2 = MxFourVector.mass2();
+      double My2 = MyFourVector.mass2();
 
-    const double M2 = (Mx2 > My2 ? Mx2 : My2);
-    const double xi = M2/(7000*7000); // sqrt(s)=7000 GeV
+      const double M2 = (Mx2 > My2 ? Mx2 : My2);
+      const double xi = M2/(7000*7000); // sqrt(s)=7000 GeV
 
-    if (xi < 5*10e-6) vetoEvent;
+      if (xi < 5*10e-6) vetoEvent;
 
-    _h_sigma->fill(7000/GeV, weight);
+      _h_sigma->fill(7000/GeV, weight);
 
     }