[Rivet-svn] r3430 - in branches/2011-07-aida2yoda: . data/anainfo src/Analyses src/Projections

[blackhole at projects.hepforge.org]

Author: hoeth
Date: Thu Oct  6 22:35:14 2011
New Revision: 3430

Log:
merge r3402-3406 from trunk

Modified:
   branches/2011-07-aida2yoda/ChangeLog
   branches/2011-07-aida2yoda/data/anainfo/ATLAS_2011_CONF_2011_090.info
   branches/2011-07-aida2yoda/src/Analyses/ATLAS_2010_S8817804.cc
   branches/2011-07-aida2yoda/src/Analyses/ATLAS_2011_CONF_2011_090.cc
   branches/2011-07-aida2yoda/src/Analyses/CDF_2008_S7540469.cc
   branches/2011-07-aida2yoda/src/Analyses/H1_1994_S2919893.cc
   branches/2011-07-aida2yoda/src/Projections/VisibleFinalState.cc

Modified: branches/2011-07-aida2yoda/ChangeLog
==============================================================================
--- branches/2011-07-aida2yoda/ChangeLog	Thu Oct  6 22:31:08 2011	(r3429)
+++ branches/2011-07-aida2yoda/ChangeLog	Thu Oct  6 22:35:14 2011	(r3430)
@@ -1,3 +1,6 @@
+2011-09-30  James Monk    <jmonk at cern.ch>
+  * fix bug in ATLAS_2010_S8817804 that misidentified the akt4 jets as akt6
+
 2011-09-29  Andy Buckley  <andy at insectnation.org>
 
 	* Converting FinalStateHCM to a slightly more general

Modified: branches/2011-07-aida2yoda/data/anainfo/ATLAS_2011_CONF_2011_090.info
==============================================================================
--- branches/2011-07-aida2yoda/data/anainfo/ATLAS_2011_CONF_2011_090.info	Thu Oct  6 22:31:08 2011	(r3429)
+++ branches/2011-07-aida2yoda/data/anainfo/ATLAS_2011_CONF_2011_090.info	Thu Oct  6 22:35:14 2011	(r3430)
@@ -4,7 +4,7 @@
 Experiment: ATLAS
 Collider: LHC
 SpiresID: 
-Status: UNVALIDATED
+Status: VALIDATED
 Authors:
  - Angela Chen <aqchen at fas.harvard.edu>
 References:

Modified: branches/2011-07-aida2yoda/src/Analyses/ATLAS_2010_S8817804.cc
==============================================================================
--- branches/2011-07-aida2yoda/src/Analyses/ATLAS_2010_S8817804.cc	Thu Oct  6 22:31:08 2011	(r3429)
+++ branches/2011-07-aida2yoda/src/Analyses/ATLAS_2010_S8817804.cc	Thu Oct  6 22:35:14 2011	(r3430)
@@ -56,8 +56,8 @@
 
     void analyze(const Event& evt) {
       Jets jetAr[2];
-      jetAr[AKT4] = applyProjection<FastJets>(evt, "AntiKT06").jetsByPt(30*GeV);
-      jetAr[AKT6] = applyProjection<FastJets>(evt, "AntiKT04").jetsByPt(30*GeV);
+      jetAr[AKT6] = applyProjection<FastJets>(evt, "AntiKT06").jetsByPt(30*GeV);
+      jetAr[AKT4] = applyProjection<FastJets>(evt, "AntiKT04").jetsByPt(30*GeV);
 
       // Identify the dijets
       for (size_t alg = 0; alg < 2; ++alg) {

Modified: branches/2011-07-aida2yoda/src/Analyses/ATLAS_2011_CONF_2011_090.cc
==============================================================================
--- branches/2011-07-aida2yoda/src/Analyses/ATLAS_2011_CONF_2011_090.cc	Thu Oct  6 22:31:08 2011	(r3429)
+++ branches/2011-07-aida2yoda/src/Analyses/ATLAS_2011_CONF_2011_090.cc	Thu Oct  6 22:35:14 2011	(r3430)
@@ -83,8 +83,8 @@
       _hist_eTmiss_mu = bookHisto1D("Et_miss_mu", 50, 0., 500.);
       _hist_m_eff_e = bookHisto1D("m_eff_e", 60, 0., 1500.);
       _hist_m_eff_mu = bookHisto1D("m_eff_mu", 60, 0., 1500.);
-      _hist_m_eff_e_final = bookHisto1D("m_eff_e_final", 60, 0., 1500.);
-      _hist_m_eff_mu_final = bookHisto1D("m_eff_mu_final", 60, 0., 1500.);
+      _hist_m_eff_e_final = bookHisto1D("m_eff_e_final", 15, 0., 1500.);
+      _hist_m_eff_mu_final = bookHisto1D("m_eff_mu_final", 15, 0., 1500.);
 
 
 
@@ -334,16 +334,12 @@
 
 
     void finalize() {
-
-
 	scale( _hist_eTmiss_e, 10. * 165. * crossSection()/sumOfWeights() );
 	scale( _hist_eTmiss_mu, 10. * 165. * crossSection()/sumOfWeights() );
 	scale( _hist_m_eff_e, 25. * 165. * crossSection()/sumOfWeights() );
 	scale( _hist_m_eff_mu, 25. * 165. * crossSection()/sumOfWeights() );
-	scale( _hist_m_eff_e_final, 25. * 165. * crossSection()/sumOfWeights() );
-	scale( _hist_m_eff_mu_final, 25. * 165. * crossSection()/sumOfWeights() );
-
-
+	scale( _hist_m_eff_e_final, 100. * 165. * crossSection()/sumOfWeights() );
+	scale( _hist_m_eff_mu_final, 100. * 165. * crossSection()/sumOfWeights() );
     }
 
   private:

Modified: branches/2011-07-aida2yoda/src/Analyses/CDF_2008_S7540469.cc
==============================================================================
--- branches/2011-07-aida2yoda/src/Analyses/CDF_2008_S7540469.cc	Thu Oct  6 22:31:08 2011	(r3429)
+++ branches/2011-07-aida2yoda/src/Analyses/CDF_2008_S7540469.cc	Thu Oct  6 22:35:14 2011	(r3430)
@@ -116,8 +116,7 @@
         }
         if (copy) jetparts.push_back(p);
       }
-      /// @todo Allow proj creation w/o FS as ctor arg, so that calc can be used more easily.
-      FastJets jetpro(fs, FastJets::CDFMIDPOINT, 0.7);
+      FastJets jetpro(FastJets::CDFMIDPOINT, 0.7);
       jetpro.calc(jetparts);
 
       // Take jets with pt > 30, |eta| < 2.1:

Modified: branches/2011-07-aida2yoda/src/Analyses/H1_1994_S2919893.cc
==============================================================================
--- branches/2011-07-aida2yoda/src/Analyses/H1_1994_S2919893.cc	Thu Oct  6 22:31:08 2011	(r3429)
+++ branches/2011-07-aida2yoda/src/Analyses/H1_1994_S2919893.cc	Thu Oct  6 22:35:14 2011	(r3430)
@@ -99,7 +99,7 @@
 
         // Energy flow histogram
         double et = fabs(Et(hcmMom));
-        double eta = -hcmMom.pseudorapidity();
+        double eta = hcmMom.pseudorapidity();
         if (x < 1e-3) {
           _histEnergyFlowLowX ->fill(eta, et*weight);
         } else {
@@ -108,7 +108,7 @@
         if (PID::threeCharge(p.pdgId()) != 0) {
           /// @todo Use units in w comparisons... what are the units?
           if (w > 50. && w <= 200.) {
-            double xf= -2 * hcmMom.z() / w;
+            double xf= 2 * hcmMom.z() / w;
             double pt2 = pT2(hcmMom);
             if (w > 50. && w <= 100.) {
               _histSpectraW77 ->fill(xf, weight);

Modified: branches/2011-07-aida2yoda/src/Projections/VisibleFinalState.cc
==============================================================================
--- branches/2011-07-aida2yoda/src/Projections/VisibleFinalState.cc	Thu Oct  6 22:31:08 2011	(r3429)
+++ branches/2011-07-aida2yoda/src/Projections/VisibleFinalState.cc	Thu Oct  6 22:35:14 2011	(r3430)
@@ -9,7 +9,7 @@
 
 
   int VisibleFinalState::compare(const Projection& p) const {
-    return FinalState::compare(p);
+    return mkNamedPCmp(p, "FS");
   }
 
 
@@ -28,6 +28,10 @@
     if ( p.pdgId() == PHOTON ) 
       return false;
 
+    // gluons are visible (for parton level analyses)
+    if ( p.pdgId() == GLUON ) 
+      return false;
+
     // everything else is invisible
     return true;
   }