[Rivet-svn] r3980 - in trunk: data/anainfo data/plotinfo src/Analyses

blackhole at projects.hepforge.org blackhole at projects.hepforge.org
Wed Nov 14 15:11:39 GMT 2012


Author: buckley
Date: Wed Nov 14 15:11:37 2012
New Revision: 3980

Log:
Merge changeset [3927] from AIDA branch

Added:
   trunk/data/anainfo/ATLAS_2012_I1117704.info
      - copied unchanged from r3927, branches/2012-06-aidarivet/data/anainfo/ATLAS_2012_I1117704.info
   trunk/data/anainfo/ATLAS_2012_I1125961.info
      - copied unchanged from r3927, branches/2012-06-aidarivet/data/anainfo/ATLAS_2012_I1125961.info
   trunk/data/plotinfo/ATLAS_2012_I1117704.plot
      - copied unchanged from r3927, branches/2012-06-aidarivet/data/plotinfo/ATLAS_2012_I1117704.plot
   trunk/data/plotinfo/ATLAS_2012_I1125961.plot
      - copied unchanged from r3927, branches/2012-06-aidarivet/data/plotinfo/ATLAS_2012_I1125961.plot
   trunk/src/Analyses/ATLAS_2012_I1117704.cc
      - copied, changed from r3927, branches/2012-06-aidarivet/src/Analyses/ATLAS_2012_I1117704.cc
   trunk/src/Analyses/ATLAS_2012_I1125961.cc
      - copied, changed from r3927, branches/2012-06-aidarivet/src/Analyses/ATLAS_2012_I1125961.cc
Deleted:
   trunk/data/anainfo/ATLAS_2012_CONF_2012_033.info
   trunk/data/anainfo/ATLAS_2012_CONF_2012_037.info
   trunk/data/plotinfo/ATLAS_2012_CONF_2012_033.plot
   trunk/data/plotinfo/ATLAS_2012_CONF_2012_037.plot
   trunk/src/Analyses/ATLAS_2012_CONF_2012_033.cc
   trunk/src/Analyses/ATLAS_2012_CONF_2012_037.cc
Modified:
   trunk/data/anainfo/Makefile.am
   trunk/data/plotinfo/Makefile.am
   trunk/src/Analyses/Makefile.am

Copied: trunk/data/anainfo/ATLAS_2012_I1117704.info (from r3927, branches/2012-06-aidarivet/data/anainfo/ATLAS_2012_I1117704.info)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/data/anainfo/ATLAS_2012_I1117704.info	Wed Nov 14 15:11:37 2012	(r3980, copy of r3927, branches/2012-06-aidarivet/data/anainfo/ATLAS_2012_I1117704.info)
@@ -0,0 +1,24 @@
+Name: ATLAS_2012_I1117704
+Year: 2012
+Summary: High jet multiplicity squark and gluino search
+Experiment: ATLAS
+Collider: LHC
+Status: VALIDATED
+Authors:
+ - Peter Richardson <peter.richardson at durham.ac.uk>
+References:
+ - arXiv:1206.1760
+RunInfo:
+  BSM signal events at 7000 GeV.
+NumEvents: 25000 for BSM signals
+Beams: [p+, p+]
+Energies: [7000]
+NeedCrossSection: yes
+Description:
+  'Search for SUSY using events with 6 or more jets in
+   association with missing transverse momentum produced in proton-proton
+   collisions at a centre-of-mass energy of 7 TeV. The data sample has a total
+   integrated luminosity of 4.7 fb$^{-1}$. Distributions
+   in the W and top control regions are not produced, while in addition to
+   the plots from the paper the count of events in the different signal regions
+   is included.'

Copied: trunk/data/anainfo/ATLAS_2012_I1125961.info (from r3927, branches/2012-06-aidarivet/data/anainfo/ATLAS_2012_I1125961.info)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/data/anainfo/ATLAS_2012_I1125961.info	Wed Nov 14 15:11:37 2012	(r3980, copy of r3927, branches/2012-06-aidarivet/data/anainfo/ATLAS_2012_I1125961.info)
@@ -0,0 +1,22 @@
+Name: ATLAS_2012_I1125961
+Year: 2012
+Summary: 0-lepton squark and gluino search
+Experiment: ATLAS
+Collider: LHC
+InspireID: 1125961
+Status: VALIDATED
+Authors:
+ - Peter Richardson <Peter.Richardson at durham.ac.uk>
+ - David Grellscheid <david.grellscheid at durham.ac.uk>
+ - Chris Wymant <c.m.wymant at durham.ac.uk>
+References:
+ - arXiv:1208.0949 
+RunInfo:
+  BSM signal events at 7000 GeV.
+NumEvents: 10000 for BSM signals
+Beams: [p+, p+]
+Energies: [7000]
+Description:
+  '0-lepton search for squarks and gluinos by ATLAS at 7 TeV.
+  Event counts in five signal regions are implemented as one-bin
+  histograms.'

Modified: trunk/data/anainfo/Makefile.am
==============================================================================
--- trunk/data/anainfo/Makefile.am	Sun Nov 11 15:34:09 2012	(r3979)
+++ trunk/data/anainfo/Makefile.am	Wed Nov 14 15:11:37 2012	(r3980)
@@ -56,8 +56,8 @@
   ATLAS_2012_I946427.info \
   ATLAS_2012_CONF_2012_001.info \
   ATLAS_2012_I1112263.info \
-  ATLAS_2012_CONF_2012_033.info \
-  ATLAS_2012_CONF_2012_037.info \
+  ATLAS_2012_I1125961.info \
+  ATLAS_2012_I1117704.info \
   ATLAS_2012_CONF_2012_041.info \
   BABAR_2005_S6181155.info \
   BABAR_2007_S6895344.info \

Copied: trunk/data/plotinfo/ATLAS_2012_I1117704.plot (from r3927, branches/2012-06-aidarivet/data/plotinfo/ATLAS_2012_I1117704.plot)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/data/plotinfo/ATLAS_2012_I1117704.plot	Wed Nov 14 15:11:37 2012	(r3980, copy of r3927, branches/2012-06-aidarivet/data/plotinfo/ATLAS_2012_I1117704.plot)
@@ -0,0 +1,87 @@
+# BEGIN PLOT /ATLAS_2012_I1117704/count_7j55
+Title=Number of events in 7 jet, $p_\perp>55$\,GeV signal region
+XLabel=
+YLabel=Number of Events
+LogY=0
+# END PLOT
+# BEGIN PLOT /ATLAS_2012_I1117704/count_8j55
+Title=Number of events in 8 jet, $p_\perp>55$\,GeV signal region
+XLabel=
+YLabel=Number of Events
+LogY=0
+# END PLOT
+# BEGIN PLOT /ATLAS_2012_I1117704/count_9j55
+Title=Number of events in 9 jet, $p_\perp>55$\,GeV signal region
+XLabel=
+YLabel=Number of Events
+LogY=0
+# END PLOT
+# BEGIN PLOT /ATLAS_2012_I1117704/count_6j80
+Title=Number of events in 6 jet, $p_\perp>80$\,GeV signal region
+XLabel=
+YLabel=Number of Events
+LogY=0
+# END PLOT
+# BEGIN PLOT /ATLAS_2012_I1117704/count_7j80
+Title=Number of events in 7 jet, $p_\perp>80$\,GeV signal region
+XLabel=
+YLabel=Number of Events
+LogY=0
+# END PLOT
+# BEGIN PLOT /ATLAS_2012_CONF_2012_038/count_8j80
+Title=Number of events in 8 jet, $p_\perp>80$\,GeV signal region
+XLabel=
+YLabel=Number of Events
+LogY=0
+# END PLOT
+
+# BEGIN PLOT /ATLAS_2012_I1117704/hist_njet55
+Title=Observed number of jets with $p_\perp>55$\,GeV for $E_{\mathrm{T}}/\sqrt{H_{\mathrm{T}}}>4\,\mathrm{GeV}^{\frac12}$
+XLabel=Number of Jets
+YLabel=Number of events
+LogY=1
+# END PLOT
+# BEGIN PLOT /ATLAS_2012_I1117704/hist_njet80
+Title=Observed number of jets with $p_\perp>80$\,GeV for $E_{\mathrm{T}}/\sqrt{H_{\mathrm{T}}}>4\,\mathrm{GeV}^{\frac12}$
+XLabel=Number of Jets
+YLabel=Number of events
+LogY=1
+# END PLOT
+
+# BEGIN PLOT /ATLAS_2012_I1117704/etmiss_HT_7j55
+Title=Observed $E_{\mathrm{T}}/\sqrt{H_{\mathrm{T}}}$ for 7 jets with $p_\perp>55$\,GeV
+XLabel=$E_{\mathrm{T}}/\sqrt{H_{\mathrm{T}}}$ [$\mathrm{GeV}^{\frac12}$]
+YLabel=$\mathrm{Events}/2$\,GeV
+LogY=1
+# END PLOT
+# BEGIN PLOT /ATLAS_2012_I1117704/etmiss_HT_8j55
+Title=Observed $E_{\mathrm{T}}/\sqrt{H_{\mathrm{T}}}$ for 8 jets with $p_\perp>55$\,GeV
+XLabel=$E_{\mathrm{T}}/\sqrt{H_{\mathrm{T}}}$ [$\mathrm{GeV}^{\frac12}$]
+YLabel=$\mathrm{Events}/2$\,GeV
+LogY=1
+# END PLOT
+# BEGIN PLOT /ATLAS_2012_I1117704/etmiss_HT_9j55
+Title=Observed $E_{\mathrm{T}}/\sqrt{H_{\mathrm{T}}}$ for 9 jets with $p_\perp>55$\,GeV
+XLabel=$E_{\mathrm{T}}/\sqrt{H_{\mathrm{T}}}$ [$\mathrm{GeV}^{\frac12}$]
+YLabel=$\mathrm{Events}/2$\,GeV
+LogY=1
+# END PLOT
+
+# BEGIN PLOT /ATLAS_2012_I1117704/etmiss_HT_6j80
+Title=Observed $E_{\mathrm{T}}/\sqrt{H_{\mathrm{T}}}$ for 6 jets with $p_\perp>80$\,GeV
+XLabel=$E_{\mathrm{T}}/\sqrt{H_{\mathrm{T}}}$ [$\mathrm{GeV}^{\frac12}$]
+YLabel=$\mathrm{Events}/2$\,GeV
+LogY=1
+# END PLOT
+# BEGIN PLOT /ATLAS_2012_I1117704/etmiss_HT_7j80
+Title=Observed $E_{\mathrm{T}}/\sqrt{H_{\mathrm{T}}}$ for 7 jets with $p_\perp>80$\,GeV
+XLabel=$E_{\mathrm{T}}/\sqrt{H_{\mathrm{T}}}$ [$\mathrm{GeV}^{\frac12}$]
+YLabel=$\mathrm{Events}/2$\,GeV
+LogY=1
+# END PLOT
+# BEGIN PLOT /ATLAS_2012_I1117704/etmiss_HT_8j80
+Title=Observed $E_{\mathrm{T}}/\sqrt{H_{\mathrm{T}}}$ for 8 jets with $p_\perp>80$\,GeV
+XLabel=$E_{\mathrm{T}}/\sqrt{H_{\mathrm{T}}}$ [$\mathrm{GeV}^{\frac12}$]
+YLabel=$\mathrm{Events}/2$\,GeV
+LogY=1
+# END PLOT

Copied: trunk/data/plotinfo/ATLAS_2012_I1125961.plot (from r3927, branches/2012-06-aidarivet/data/plotinfo/ATLAS_2012_I1125961.plot)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/data/plotinfo/ATLAS_2012_I1125961.plot	Wed Nov 14 15:11:37 2012	(r3980, copy of r3927, branches/2012-06-aidarivet/data/plotinfo/ATLAS_2012_I1125961.plot)
@@ -0,0 +1,109 @@
+# BEGIN PLOT /ATLAS_2012_I1125961/count_A_tight
+Title=Number of events in the tight A signal region
+XLabel=
+YLabel=Number of Events
+LogY=0
+# END PLOT
+# BEGIN PLOT /ATLAS_2012_I1125961/count_A_medium
+Title=Number of events in the medium A signal region
+XLabel=
+YLabel=Number of Events
+LogY=0
+# END PLOT
+# BEGIN PLOT /ATLAS_2012_I1125961/count_A_loose
+Title=Number of events in the loose A signal region
+XLabel=
+YLabel=Number of Events
+LogY=0
+# END PLOT
+# BEGIN PLOT /ATLAS_2012_I1125961/count_Ap_medium
+Title=Number of events in the medium ${\rm A}'$ signal region
+XLabel=
+YLabel=Number of Events
+LogY=0
+# END PLOT
+# BEGIN PLOT /ATLAS_2012_I1125961/count_B_tight
+Title=Number of events in the tight B signal region
+XLabel=
+YLabel=Number of Events
+LogY=0
+# END PLOT
+# BEGIN PLOT /ATLAS_2012_I1125961/count_C_tight
+Title=Number of events in the tight C signal region
+XLabel=
+YLabel=Number of Events
+LogY=0
+# END PLOT
+# BEGIN PLOT /ATLAS_2012_I1125961/count_C_medium
+Title=Number of events in the medium C signal region
+XLabel=
+YLabel=Number of Events
+LogY=0
+# END PLOT
+# BEGIN PLOT /ATLAS_2012_I1125961/count_C_loose
+Title=Number of events in the loose C signal region
+XLabel=
+YLabel=Number of Events
+LogY=0
+# END PLOT
+# BEGIN PLOT /ATLAS_2012_I1125961/count_D_tight
+Title=Number of events in the tight D signal region
+XLabel=
+YLabel=Number of Events
+LogY=0
+# END PLOT
+# BEGIN PLOT /ATLAS_2012_I1125961/count_E_tight
+Title=Number of events in the tight E signal region
+XLabel=
+YLabel=Number of Events
+LogY=0
+# END PLOT
+# BEGIN PLOT /ATLAS_2012_I1125961/count_E_medium
+Title=Number of events in the medium E signal region
+XLabel=
+YLabel=Number of Events
+LogY=0
+# END PLOT
+# BEGIN PLOT /ATLAS_2012_I1125961/count_E_loose
+Title=Number of events in the loose E signal region
+XLabel=
+YLabel=Number of Events
+LogY=0
+# END PLOT
+
+# BEGIN PLOT /ATLAS_2012_I1125961/hist_m_eff_A
+Title=Effective Mass in the A Signal Region
+XLabel=$M_{\mathrm{eff}}$ [GeV]
+YLabel=$\mathrm{Events}/100 \mathrm{GeV}$
+LogY=1
+# END PLOT
+# BEGIN PLOT /ATLAS_2012_I1125961/hist_m_eff_Ap
+Title=Effective Mass in the ${\rm A}'$ Signal Region
+XLabel=$M_{\mathrm{eff}}$ [GeV]
+YLabel=$\mathrm{Events}/100 \mathrm{GeV}$
+LogY=1
+# END PLOT
+# BEGIN PLOT /ATLAS_2012_I1125961/hist_m_eff_B
+Title=Effective Mass in the B Signal Region
+XLabel=$M_{\mathrm{eff}}$ [GeV]
+YLabel=$\mathrm{Events}/100 \mathrm{GeV}$
+LogY=1
+# END PLOT
+# BEGIN PLOT /ATLAS_2012_I1125961/hist_m_eff_C
+Title=Effective Mass in the C Signal Region
+XLabel=$M_{\mathrm{eff}}$ [GeV]
+YLabel=$\mathrm{Events}/100 \mathrm{GeV}$
+LogY=1
+# END PLOT
+# BEGIN PLOT /ATLAS_2012_I1125961/hist_m_eff_D
+Title=Effective Mass in the D Signal Region
+XLabel=$M_{\mathrm{eff}}$ [GeV]
+YLabel=$\mathrm{Events}/100 \mathrm{GeV}$
+LogY=1
+# END PLOT
+# BEGIN PLOT /ATLAS_2012_I1125961/hist_m_eff_E
+Title=Effective Mass in the E Signal Region
+XLabel=$M_{\mathrm{eff}}$ [GeV]
+YLabel=$\mathrm{Events}/100 \mathrm{GeV}$
+LogY=1
+# END PLOT

Modified: trunk/data/plotinfo/Makefile.am
==============================================================================
--- trunk/data/plotinfo/Makefile.am	Sun Nov 11 15:34:09 2012	(r3979)
+++ trunk/data/plotinfo/Makefile.am	Wed Nov 14 15:11:37 2012	(r3980)
@@ -52,8 +52,8 @@
   ATLAS_2012_I946427.plot \
   ATLAS_2012_CONF_2012_001.plot \
   ATLAS_2012_I1112263.plot \
-  ATLAS_2012_CONF_2012_033.plot \
-  ATLAS_2012_CONF_2012_037.plot \
+  ATLAS_2012_I1125961.plot \
+  ATLAS_2012_I1117704.plot \
   ATLAS_2012_CONF_2012_041.plot \
   ATLAS_2012_I1082009.plot \
   BABAR_2005_S6181155.plot \

Copied and modified: trunk/src/Analyses/ATLAS_2012_I1117704.cc (from r3927, branches/2012-06-aidarivet/src/Analyses/ATLAS_2012_I1117704.cc)
==============================================================================
--- branches/2012-06-aidarivet/src/Analyses/ATLAS_2012_I1117704.cc	Wed Sep 12 17:36:56 2012	(r3927, copy source)
+++ trunk/src/Analyses/ATLAS_2012_I1117704.cc	Wed Nov 14 15:11:37 2012	(r3980)
@@ -1,7 +1,7 @@
 // -*- C++ -*-
 #include "Rivet/Analysis.hh"
 #include "Rivet/Tools/BinnedHistogram.hh"
-#include "Rivet/RivetAIDA.hh"
+#include "Rivet/RivetYODA.hh"
 #include "Rivet/Tools/Logging.hh"
 #include "Rivet/Projections/FinalState.hh"
 #include "Rivet/Projections/ChargedFinalState.hh"
@@ -64,22 +64,22 @@
       addProjection(ChargedFinalState(-3.0,3.0),"cfs");
 
       /// Book histograms
-      _etmiss_HT_7j55 = bookHistogram1D("etmiss_HT_7j55", 8, 0., 16.);
-      _etmiss_HT_8j55 = bookHistogram1D("etmiss_HT_8j55", 8, 0., 16.);
-      _etmiss_HT_9j55 = bookHistogram1D("etmiss_HT_9j55", 8, 0., 16.);
-      _etmiss_HT_6j80 = bookHistogram1D("etmiss_HT_6j80", 8, 0., 16.);
-      _etmiss_HT_7j80 = bookHistogram1D("etmiss_HT_7j80", 8, 0., 16.);
-      _etmiss_HT_8j80 = bookHistogram1D("etmiss_HT_8j80", 8, 0., 16.);
-
-      _hist_njet55 = bookHistogram1D("hist_njet55", 11, 2.5, 13.5);
-      _hist_njet80 = bookHistogram1D("hist_njet80", 11, 2.5, 13.5);
-
-      _count_7j55 = bookHistogram1D("count_7j55", 1, 0., 1.);
-      _count_8j55 = bookHistogram1D("count_8j55", 1, 0., 1.);
-      _count_9j55 = bookHistogram1D("count_9j55", 1, 0., 1.);
-      _count_6j80 = bookHistogram1D("count_6j80", 1, 0., 1.);
-      _count_7j80 = bookHistogram1D("count_7j80", 1, 0., 1.);
-      _count_8j80 = bookHistogram1D("count_8j80", 1, 0., 1.);
+      _etmiss_HT_7j55 = bookHisto1D("etmiss_HT_7j55", 8, 0., 16.);
+      _etmiss_HT_8j55 = bookHisto1D("etmiss_HT_8j55", 8, 0., 16.);
+      _etmiss_HT_9j55 = bookHisto1D("etmiss_HT_9j55", 8, 0., 16.);
+      _etmiss_HT_6j80 = bookHisto1D("etmiss_HT_6j80", 8, 0., 16.);
+      _etmiss_HT_7j80 = bookHisto1D("etmiss_HT_7j80", 8, 0., 16.);
+      _etmiss_HT_8j80 = bookHisto1D("etmiss_HT_8j80", 8, 0., 16.);
+
+      _hist_njet55 = bookHisto1D("hist_njet55", 11, 2.5, 13.5);
+      _hist_njet80 = bookHisto1D("hist_njet80", 11, 2.5, 13.5);
+
+      _count_7j55 = bookHisto1D("count_7j55", 1, 0., 1.);
+      _count_8j55 = bookHisto1D("count_8j55", 1, 0., 1.);
+      _count_9j55 = bookHisto1D("count_9j55", 1, 0., 1.);
+      _count_6j80 = bookHisto1D("count_6j80", 1, 0., 1.);
+      _count_7j80 = bookHisto1D("count_7j80", 1, 0., 1.);
+      _count_8j80 = bookHisto1D("count_8j80", 1, 0., 1.);
 
     }
 
@@ -121,14 +121,14 @@
       foreach ( const Jet& jet, cand_jets ) {
         // candidates after |eta| < 2.8
         if ( fabs( jet.momentum().eta() ) >= 2.8 ) continue;
-	bool away_from_e = true;
-	foreach ( const Particle & e, cand_e ) {
-	  if ( deltaR(e.momentum(),jet.momentum()) <= 0.2 ) {
-	    away_from_e = false;
-	    break;
-	  }
-	}
-	if ( away_from_e ) recon_jets.push_back( jet );
+        bool away_from_e = true;
+        foreach ( const Particle & e, cand_e ) {
+          if ( deltaR(e.momentum(),jet.momentum()) <= 0.2 ) {
+            away_from_e = false;
+            break;
+          }
+        }
+        if ( away_from_e ) recon_jets.push_back( jet );
       }
 
       // only keep electrons more than R=0.4 from jets
@@ -193,45 +193,45 @@
       double ratio = eTmiss/sqrt(HT);
 
       if(ratio>4.) {
-	_hist_njet55->fill(njet55,weight);
-	_hist_njet80->fill(njet80,weight);
-	// 7j55
-	if(njet55>=7) 
-	  _count_7j55->fill( 0.5, weight); 
-	// 8j55
-	if(njet55>=8) 
-	  _count_8j55->fill( 0.5, weight) ;
-	// 8j55
-	if(njet55>=9)
-	  _count_9j55->fill( 0.5, weight) ;
-	// 6j80
-	if(njet80>=6)
-	  _count_6j80->fill( 0.5, weight) ;
-	// 7j80
-	if(njet80>=7)
-	  _count_7j80->fill( 0.5, weight) ;
-	// 8j80
-	if(njet80>=7)
-	  _count_8j80->fill( 0.5, weight) ;
+        _hist_njet55->fill(njet55,weight);
+        _hist_njet80->fill(njet80,weight);
+        // 7j55
+        if(njet55>=7)
+          _count_7j55->fill( 0.5, weight);
+        // 8j55
+        if(njet55>=8)
+          _count_8j55->fill( 0.5, weight) ;
+        // 8j55
+        if(njet55>=9)
+          _count_9j55->fill( 0.5, weight) ;
+        // 6j80
+        if(njet80>=6)
+          _count_6j80->fill( 0.5, weight) ;
+        // 7j80
+        if(njet80>=7)
+          _count_7j80->fill( 0.5, weight) ;
+        // 8j80
+        if(njet80>=7)
+          _count_8j80->fill( 0.5, weight) ;
       }
 
-      if(njet55>=7) 
-	_etmiss_HT_7j55->fill( ratio, weight); 
+      if(njet55>=7)
+        _etmiss_HT_7j55->fill( ratio, weight);
       // 8j55
-      if(njet55>=8) 
-	_etmiss_HT_8j55->fill( ratio, weight) ;
+      if(njet55>=8)
+        _etmiss_HT_8j55->fill( ratio, weight) ;
       // 8j55
       if(njet55>=9)
-	_etmiss_HT_9j55->fill( ratio, weight) ;
+        _etmiss_HT_9j55->fill( ratio, weight) ;
       // 6j80
       if(njet80>=6)
-	_etmiss_HT_6j80->fill( ratio, weight) ;
+        _etmiss_HT_6j80->fill( ratio, weight) ;
       // 7j80
       if(njet80>=7)
-	_etmiss_HT_7j80->fill( ratio, weight) ;
+        _etmiss_HT_7j80->fill( ratio, weight) ;
       // 8j80
       if(njet80>=7)
-	_etmiss_HT_8j80->fill( ratio, weight) ;
+        _etmiss_HT_8j80->fill( ratio, weight) ;
 
     }
 
@@ -262,22 +262,22 @@
 
     /// @name Histograms
     //@{
-    AIDA::IHistogram1D* _etmiss_HT_7j55;
-    AIDA::IHistogram1D* _etmiss_HT_8j55;
-    AIDA::IHistogram1D* _etmiss_HT_9j55;
-    AIDA::IHistogram1D* _etmiss_HT_6j80;
-    AIDA::IHistogram1D* _etmiss_HT_7j80;
-    AIDA::IHistogram1D* _etmiss_HT_8j80;
-
-    AIDA::IHistogram1D* _hist_njet55;
-    AIDA::IHistogram1D* _hist_njet80;
-
-    AIDA::IHistogram1D* _count_7j55;
-    AIDA::IHistogram1D* _count_8j55;
-    AIDA::IHistogram1D* _count_9j55;
-    AIDA::IHistogram1D* _count_6j80;
-    AIDA::IHistogram1D* _count_7j80;
-    AIDA::IHistogram1D* _count_8j80;
+    Histo1DPtr _etmiss_HT_7j55;
+    Histo1DPtr _etmiss_HT_8j55;
+    Histo1DPtr _etmiss_HT_9j55;
+    Histo1DPtr _etmiss_HT_6j80;
+    Histo1DPtr _etmiss_HT_7j80;
+    Histo1DPtr _etmiss_HT_8j80;
+
+    Histo1DPtr _hist_njet55;
+    Histo1DPtr _hist_njet80;
+
+    Histo1DPtr _count_7j55;
+    Histo1DPtr _count_8j55;
+    Histo1DPtr _count_9j55;
+    Histo1DPtr _count_6j80;
+    Histo1DPtr _count_7j80;
+    Histo1DPtr _count_8j80;
     //@}
 
   };

Copied and modified: trunk/src/Analyses/ATLAS_2012_I1125961.cc (from r3927, branches/2012-06-aidarivet/src/Analyses/ATLAS_2012_I1125961.cc)
==============================================================================
--- branches/2012-06-aidarivet/src/Analyses/ATLAS_2012_I1125961.cc	Wed Sep 12 17:36:56 2012	(r3927, copy source)
+++ trunk/src/Analyses/ATLAS_2012_I1125961.cc	Wed Nov 14 15:11:37 2012	(r3980)
@@ -1,7 +1,7 @@
 // -*- C++ -*-
 #include "Rivet/Analysis.hh"
 #include "Rivet/Tools/BinnedHistogram.hh"
-#include "Rivet/RivetAIDA.hh"
+#include "Rivet/RivetYODA.hh"
 #include "Rivet/Tools/Logging.hh"
 #include "Rivet/Projections/FinalState.hh"
 #include "Rivet/Projections/ChargedFinalState.hh"
@@ -61,24 +61,24 @@
       addProjection(VisibleFinalState(-4.5,4.5),"vfs");
 
       // Book histograms
-      _count_A_tight   = bookHistogram1D("count_A_tight"   , 1, 0., 1.);
-      _count_A_medium  = bookHistogram1D("count_A_medium"  , 1, 0., 1.);
-      _count_Ap_medium = bookHistogram1D("count_Ap_medium" , 1, 0., 1.);
-      _count_B_tight   = bookHistogram1D("count_B_tight"   , 1, 0., 1.);
-      _count_C_tight   = bookHistogram1D("count_C_tight"   , 1, 0., 1.);
-      _count_C_medium  = bookHistogram1D("count_C_medium"  , 1, 0., 1.);
-      _count_C_loose   = bookHistogram1D("count_C_loose"   , 1, 0., 1.);
-      _count_D_tight   = bookHistogram1D("count_D_tight"   , 1, 0., 1.);
-      _count_E_tight   = bookHistogram1D("count_E_tight"   , 1, 0., 1.);
-      _count_E_medium  = bookHistogram1D("count_E_medium"  , 1, 0., 1.);
-      _count_E_loose   = bookHistogram1D("count_E_loose"   , 1, 0., 1.);
-
-      _hist_meff_A  = bookHistogram1D("hist_m_eff_A" , 30, 0., 3000.);
-      _hist_meff_Ap = bookHistogram1D("hist_m_eff_Ap", 30, 0., 3000.);
-      _hist_meff_B  = bookHistogram1D("hist_m_eff_B" , 30, 0., 3000.);
-      _hist_meff_C  = bookHistogram1D("hist_m_eff_C" , 30, 0., 3000.);
-      _hist_meff_D  = bookHistogram1D("hist_m_eff_D" , 30, 0., 3000.);
-      _hist_meff_E  = bookHistogram1D("hist_m_eff_E" , 30, 0., 3000.);
+      _count_A_tight   = bookHisto1D("count_A_tight"   , 1, 0., 1.);
+      _count_A_medium  = bookHisto1D("count_A_medium"  , 1, 0., 1.);
+      _count_Ap_medium = bookHisto1D("count_Ap_medium" , 1, 0., 1.);
+      _count_B_tight   = bookHisto1D("count_B_tight"   , 1, 0., 1.);
+      _count_C_tight   = bookHisto1D("count_C_tight"   , 1, 0., 1.);
+      _count_C_medium  = bookHisto1D("count_C_medium"  , 1, 0., 1.);
+      _count_C_loose   = bookHisto1D("count_C_loose"   , 1, 0., 1.);
+      _count_D_tight   = bookHisto1D("count_D_tight"   , 1, 0., 1.);
+      _count_E_tight   = bookHisto1D("count_E_tight"   , 1, 0., 1.);
+      _count_E_medium  = bookHisto1D("count_E_medium"  , 1, 0., 1.);
+      _count_E_loose   = bookHisto1D("count_E_loose"   , 1, 0., 1.);
+
+      _hist_meff_A  = bookHisto1D("hist_m_eff_A" , 30, 0., 3000.);
+      _hist_meff_Ap = bookHisto1D("hist_m_eff_Ap", 30, 0., 3000.);
+      _hist_meff_B  = bookHisto1D("hist_m_eff_B" , 30, 0., 3000.);
+      _hist_meff_C  = bookHisto1D("hist_m_eff_C" , 30, 0., 3000.);
+      _hist_meff_D  = bookHisto1D("hist_m_eff_D" , 30, 0., 3000.);
+      _hist_meff_E  = bookHisto1D("hist_m_eff_E" , 30, 0., 3000.);
 
     }
 
@@ -90,9 +90,9 @@
       Jets cand_jets;
       const Jets jets = applyProjection<FastJets>(event, "AntiKtJets04").jetsByPt(20.0*GeV);
       foreach (const Jet& jet, jets) {
-	if ( fabs( jet.momentum().eta() ) < 4.9 ) {
-	  cand_jets.push_back(jet);
-	}
+        if ( fabs( jet.momentum().eta() ) < 4.9 ) {
+          cand_jets.push_back(jet);
+        }
       }
 
       const ParticleVector cand_e  = applyProjection<IdentifiedFinalState>(event, "elecs").particlesByPt();
@@ -114,15 +114,15 @@
       // Resolve jet-lepton overlap for jets with |eta| < 2.8
       Jets recon_jets;
       foreach ( const Jet& jet, cand_jets ) {
-	if ( fabs( jet.momentum().eta() ) >= 2.8 ) continue;
-	bool away_from_e = true;
-	foreach ( const Particle & e, cand_e ) {
-	  if ( deltaR(e.momentum(),jet.momentum()) <= 0.2 ) {
-	    away_from_e = false;
-	    break;
-	  }
-	}
-	if ( away_from_e ) recon_jets.push_back( jet );
+        if ( fabs( jet.momentum().eta() ) >= 2.8 ) continue;
+        bool away_from_e = true;
+        foreach ( const Particle & e, cand_e ) {
+          if ( deltaR(e.momentum(),jet.momentum()) <= 0.2 ) {
+            away_from_e = false;
+            break;
+          }
+        }
+        if ( away_from_e ) recon_jets.push_back( jet );
       }
 
       ParticleVector recon_e, recon_mu;
@@ -167,15 +167,15 @@
         MSG_DEBUG("Charged leptons left after selection");
         vetoEvent;
       }
-      
+
       if ( eTmiss <= 160 * GeV ) {
         MSG_DEBUG("Not enough eTmiss: " << eTmiss << " < 130");
         vetoEvent;
       }
 
-      if ( recon_jets.size()<2 || 
-	   recon_jets[0].momentum().pT() <= 130.0 * GeV || 
-	   recon_jets[0].momentum().pT() <=  60.0 * GeV ) {
+      if ( recon_jets.size()<2 ||
+           recon_jets[0].momentum().pT() <= 130.0 * GeV ||
+           recon_jets[0].momentum().pT() <=  60.0 * GeV ) {
         MSG_DEBUG("No hard leading jet in " << recon_jets.size() << " jets");
         vetoEvent;
       }
@@ -189,83 +189,83 @@
       double pTmiss_phi = pTmiss.phi();
       foreach ( const Jet& jet, recon_jets ) {
         if ( jet.momentum().pT() < 40 * GeV ) continue;
-	if ( Njets < 2 ) {
-	  min_dPhi_2 = min( min_dPhi_2, deltaPhi( pTmiss_phi, jet.momentum().phi() ) );
-	}
-	if( Njets < 3) {
-	  min_dPhi_3 = min( min_dPhi_3, deltaPhi( pTmiss_phi, jet.momentum().phi() ) );
-	}
-	min_dPhi_All = min( min_dPhi_All, deltaPhi( pTmiss_phi, jet.momentum().phi() ) );
-	++Njets;
+        if ( Njets < 2 ) {
+          min_dPhi_2 = min( min_dPhi_2, deltaPhi( pTmiss_phi, jet.momentum().phi() ) );
+        }
+        if( Njets < 3) {
+          min_dPhi_3 = min( min_dPhi_3, deltaPhi( pTmiss_phi, jet.momentum().phi() ) );
+        }
+        min_dPhi_All = min( min_dPhi_All, deltaPhi( pTmiss_phi, jet.momentum().phi() ) );
+        ++Njets;
       }
 
       // inclusive meff
       double m_eff_inc =  eTmiss;
       foreach ( const Jet& jet, recon_jets ) {
-	double perp =  jet.momentum().pT();
-	if(perp>40.) m_eff_inc += perp;
+        double perp =  jet.momentum().pT();
+        if(perp>40.) m_eff_inc += perp;
       }
 
       // region A
       double m_eff_Nj = eTmiss + recon_jets[0].momentum().pT() + recon_jets[1].momentum().pT();
       if( min_dPhi_2 > 0.4 && eTmiss/m_eff_Nj > 0.3 ) {
-	_hist_meff_A->fill(m_eff_inc,weight);
-	if(m_eff_inc>1900.) _count_A_tight ->fill(0.5,weight);
-	if(m_eff_inc>1400.) _count_A_medium->fill(0.5,weight);
+        _hist_meff_A->fill(m_eff_inc,weight);
+        if(m_eff_inc>1900.) _count_A_tight ->fill(0.5,weight);
+        if(m_eff_inc>1400.) _count_A_medium->fill(0.5,weight);
       }
 
       // region A'
       if( min_dPhi_2 > 0.4 && eTmiss/m_eff_Nj > 0.4 ) {
-	_hist_meff_Ap->fill(m_eff_inc,weight);
-	if(m_eff_inc>1200.) _count_Ap_medium->fill(0.5,weight);
+        _hist_meff_Ap->fill(m_eff_inc,weight);
+        if(m_eff_inc>1200.) _count_Ap_medium->fill(0.5,weight);
       }
 
       // for rest of regions 3 jets pT> 60 needed
-      if(recon_jets.size()<3 || recon_jets[2].momentum().perp()<60.) 
-	vetoEvent;
+      if(recon_jets.size()<3 || recon_jets[2].momentum().perp()<60.)
+        vetoEvent;
 
       // region B
       m_eff_Nj +=  recon_jets[2].momentum().perp();
       if( min_dPhi_3 > 0.4 && eTmiss/m_eff_Nj > 0.25 ) {
-	_hist_meff_B->fill(m_eff_inc,weight);
-	if(m_eff_inc>1900.) _count_B_tight ->fill(0.5,weight);
+        _hist_meff_B->fill(m_eff_inc,weight);
+        if(m_eff_inc>1900.) _count_B_tight ->fill(0.5,weight);
       }
 
       // for rest of regions 4 jets pT> 60 needed
-      if(recon_jets.size()<4 || recon_jets[3].momentum().perp()<60.) 
-	vetoEvent;
+      if(recon_jets.size()<4 || recon_jets[3].momentum().perp()<60.)
+        vetoEvent;
 
       // region C
       m_eff_Nj +=  recon_jets[3].momentum().perp();
       if( min_dPhi_3 > 0.4 && min_dPhi_All > 0.2 && eTmiss/m_eff_Nj > 0.25 ) {
-	_hist_meff_C->fill(m_eff_inc,weight);
-	if(m_eff_inc>1500.) _count_C_tight ->fill(0.5,weight);
-	if(m_eff_inc>1200.) _count_C_medium->fill(0.5,weight);
-	if(m_eff_inc> 900.) _count_C_loose ->fill(0.5,weight);
+        _hist_meff_C->fill(m_eff_inc,weight);
+        if(m_eff_inc>1500.) _count_C_tight ->fill(0.5,weight);
+        if(m_eff_inc>1200.) _count_C_medium->fill(0.5,weight);
+        if(m_eff_inc> 900.) _count_C_loose ->fill(0.5,weight);
       }
 
       // for rest of regions 5 jets pT> 40 needed
-      if(recon_jets.size()<5 || recon_jets[4].momentum().perp()<40.) 
-	vetoEvent;
+      if(recon_jets.size()<5 || recon_jets[4].momentum().perp()<40.)
+        vetoEvent;
 
       // region D
       m_eff_Nj +=  recon_jets[4].momentum().perp();
       if( min_dPhi_3 > 0.4 && min_dPhi_All > 0.2 && eTmiss/m_eff_Nj > 0.2 ) {
-	_hist_meff_D->fill(m_eff_inc,weight);
-	if(m_eff_inc>1500.) _count_D_tight ->fill(0.5,weight);
+        _hist_meff_D->fill(m_eff_inc,weight);
+        if(m_eff_inc>1500.) _count_D_tight ->fill(0.5,weight);
       }
 
       // for rest of regions 6 jets pT> 40 needed
-      if(recon_jets.size()<6 || recon_jets[5].momentum().perp()<40.) 
-	vetoEvent;
+      if(recon_jets.size()<6 || recon_jets[5].momentum().perp()<40.)
+        vetoEvent;
 
       // region E
       m_eff_Nj +=  recon_jets[5].momentum().perp();
       if( min_dPhi_3 > 0.4 && min_dPhi_All > 0.2 && eTmiss/m_eff_Nj > 0.15 ) {
-	_hist_meff_E->fill(m_eff_inc,weight);
-	if(m_eff_inc>1400.) _count_E_tight ->fill(0.5,weight);
-	if(m_eff_inc>1200.) _count_E_medium->fill(0.5,weight);
-	if(m_eff_inc> 900.) _count_E_loose ->fill(0.5,weight);
+        _hist_meff_E->fill(m_eff_inc,weight);
+        if(m_eff_inc>1400.) _count_E_tight ->fill(0.5,weight);
+        if(m_eff_inc>1200.) _count_E_medium->fill(0.5,weight);
+        if(m_eff_inc> 900.) _count_E_loose ->fill(0.5,weight);
       }
     }
 
@@ -299,25 +299,25 @@
 
   private:
 
-    AIDA::IHistogram1D* _count_A_tight;
-    AIDA::IHistogram1D* _count_A_medium;
-    AIDA::IHistogram1D* _count_Ap_medium;
-    AIDA::IHistogram1D* _count_B_tight;
-    AIDA::IHistogram1D* _count_C_tight;
-    AIDA::IHistogram1D* _count_C_medium;
-    AIDA::IHistogram1D* _count_C_loose;
-    AIDA::IHistogram1D* _count_D_tight;
-    AIDA::IHistogram1D* _count_E_tight;
-    AIDA::IHistogram1D* _count_E_medium;
-    AIDA::IHistogram1D* _count_E_loose;
-    
-    AIDA::IHistogram1D* _hist_meff_A ;
-    AIDA::IHistogram1D* _hist_meff_Ap;
-    AIDA::IHistogram1D* _hist_meff_B ;
-    AIDA::IHistogram1D* _hist_meff_C ;
-    AIDA::IHistogram1D* _hist_meff_D ;
-    AIDA::IHistogram1D* _hist_meff_E ;
-    
+    Histo1DPtr _count_A_tight;
+    Histo1DPtr _count_A_medium;
+    Histo1DPtr _count_Ap_medium;
+    Histo1DPtr _count_B_tight;
+    Histo1DPtr _count_C_tight;
+    Histo1DPtr _count_C_medium;
+    Histo1DPtr _count_C_loose;
+    Histo1DPtr _count_D_tight;
+    Histo1DPtr _count_E_tight;
+    Histo1DPtr _count_E_medium;
+    Histo1DPtr _count_E_loose;
+
+    Histo1DPtr _hist_meff_A ;
+    Histo1DPtr _hist_meff_Ap;
+    Histo1DPtr _hist_meff_B ;
+    Histo1DPtr _hist_meff_C ;
+    Histo1DPtr _hist_meff_D ;
+    Histo1DPtr _hist_meff_E ;
+
   };
 
 

Modified: trunk/src/Analyses/Makefile.am
==============================================================================
--- trunk/src/Analyses/Makefile.am	Sun Nov 11 15:34:09 2012	(r3979)
+++ trunk/src/Analyses/Makefile.am	Wed Nov 14 15:11:37 2012	(r3980)
@@ -75,12 +75,12 @@
     ATLAS_2012_I1091481.cc \
     ATLAS_2012_I1093738.cc \
     ATLAS_2012_I1094568.cc \
-    ATLAS_2012_I1112263.cc
+    ATLAS_2012_I1112263.cc \
+    ATLAS_2012_I1125961.cc \
+    ATLAS_2012_I1117704.cc
 if ENABLE_PRELIMINARY
 RivetATLASAnalyses_la_SOURCES += \
-    ATLAS_2012_CONF_2012_001.cc \
-    ATLAS_2012_CONF_2012_033.cc \
-    ATLAS_2012_CONF_2012_037.cc
+    ATLAS_2012_CONF_2012_001.cc
 endif
 if ENABLE_UNVALIDATED
 RivetATLASAnalyses_la_SOURCES += \
@@ -238,7 +238,7 @@
     DELPHI_1995_S3137023.cc \
     DELPHI_1996_S3430090.cc \
     DELPHI_1999_S3960137.cc \
-    DELPHI_2000_S4328825.cc  \
+    DELPHI_2000_S4328825.cc \
     OPAL_1993_S2692198.cc \
     OPAL_1994_S2927284.cc \
     OPAL_1995_S3198391.cc \


More information about the Rivet-svn mailing list