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

blackhole at projects.hepforge.org blackhole at projects.hepforge.org
Thu Oct 15 13:14:40 BST 2009


Author: hoeth
Date: Thu Oct 15 13:14:40 2009
New Revision: 1908

Log:
STAR 2009 UE analysis. The code works, but we still need to ask the
author about the overlap_threshold for SISCONE and the eta-range of
their jet finding.

Added:
   trunk/data/anainfo/STAR_2009_UE_HELEN.info
   trunk/data/plotinfo/STAR_2009_UE_HELEN.plot
Modified:
   trunk/data/anainfo/Makefile.am
   trunk/data/plotinfo/Makefile.am
   trunk/data/refdata/STAR_2009_UE_HELEN.aida
   trunk/data/refdata/STAR_2009_UE_HELEN.dat
   trunk/src/Analyses/Makefile.am
   trunk/src/Analyses/STAR_2009_UE_HELEN.cc

Modified: trunk/data/anainfo/Makefile.am
==============================================================================
--- trunk/data/anainfo/Makefile.am	Thu Oct 15 12:54:02 2009	(r1907)
+++ trunk/data/anainfo/Makefile.am	Thu Oct 15 13:14:40 2009	(r1908)
@@ -62,6 +62,7 @@
   SFM_1984_S1178091.info \
   STAR_2006_S6870392.info \
   STAR_2008_S7993412.info \
+  STAR_2009_UE_HELEN.info \
   ZEUS_2001_S4815815.info \
   UA1_1990_S2044935.info \
   UA5_1982_S875503.info \

Added: trunk/data/anainfo/STAR_2009_UE_HELEN.info
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/data/anainfo/STAR_2009_UE_HELEN.info	Thu Oct 15 13:14:40 2009	(r1908)
@@ -0,0 +1,27 @@
+Name: STAR_2009_UE_HELEN
+Year: 2009
+Summary: UE measurement in pp at 200 GeV
+Experiment: STAR
+Collider: RHIC pp 200 GeV
+SpiresID: None
+Status: UNVALIDATED
+Authors:
+ - Helen Caines <helen.caines at yale.edu>
+ - Hendrik Hoeth <hendrik.hoeth at cern.ch>
+References:
+ - presented at Quark-Matter 2009
+RunInfo:
+  pp at 200 GeV
+NumEvents: 1000000
+PtCuts: [2, 10]
+Description:
+  UE analysis similar to Rick Field's leading jet analysis. SIScone with
+  radius/resolution paramter R=0.7 is used. Particles with pT > 0.2 GeV
+  and |eta| < 1 are included in the analysis. All particles are assumed
+  to have zero mass. Only jets with neutral energy < 0.7 are included.
+  For the transMIN and transMAX delta(Phi) is between pi/3 and 2pi/3 and
+  delta(eta)<2.0. For the jet region the area of the jet is used for the
+  normalization, i.e. the scaling factor is pi*R^2 and not dphi*deta (this
+  is different from what Rick Field does!). The tracking efficiency is ~0.8,
+  but that is an approximation, as below pT~0.6GeV it is falling quite
+  steeply.

Modified: trunk/data/plotinfo/Makefile.am
==============================================================================
--- trunk/data/plotinfo/Makefile.am	Thu Oct 15 12:54:02 2009	(r1907)
+++ trunk/data/plotinfo/Makefile.am	Thu Oct 15 13:14:40 2009	(r1908)
@@ -63,6 +63,7 @@
   SFM_1984_S1178091.plot \
   STAR_2006_S6870392.plot \
   STAR_2008_S7993412.plot \
+  STAR_2009_UE_HELEN.plot \
   ZEUS_2001_S4815815.plot \
   UA1_1990_S2044935.plot \
   UA5_1982_S875503.plot \

Added: trunk/data/plotinfo/STAR_2009_UE_HELEN.plot
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/data/plotinfo/STAR_2009_UE_HELEN.plot	Thu Oct 15 13:14:40 2009	(r1908)
@@ -0,0 +1,18 @@
+# BEGIN PLOT /STAR_2009_UE_HELEN/d01-x01-y01
+Title=TransMAX region charged particle density
+XLabel=$p_T(\text{leading jet})$ / GeV
+YLabel=$\langle N_\text{ch} \rangle / \text{d}\eta\,\text{d}\phi$
+# END PLOT
+
+# BEGIN PLOT /STAR_2009_UE_HELEN/d02-x01-y01
+Title=TransMIN region charged particle density
+XLabel=$p_T(\text{leading jet})$ / GeV
+YLabel=$\langle N_\text{ch} \rangle / \text{d}\eta\,\text{d}\phi$
+# END PLOT
+
+# BEGIN PLOT /STAR_2009_UE_HELEN/d02-x01-y01
+Title=Away region charged particle density
+XLabel=$p_T(\text{leading jet})$ / GeV
+YLabel=$\langle N_\text{ch} \rangle / \text{jet area}$
+# END PLOT
+

Modified: trunk/data/refdata/STAR_2009_UE_HELEN.aida
==============================================================================
--- trunk/data/refdata/STAR_2009_UE_HELEN.aida	Thu Oct 15 12:54:02 2009	(r1907)
+++ trunk/data/refdata/STAR_2009_UE_HELEN.aida	Thu Oct 15 13:14:40 2009	(r1908)
@@ -3,79 +3,82 @@
 <aida version="3.3">
   <implementation version="1.1" package="FreeHEP"/>
   <dataPointSet name="d01-x01-y01" dimension="2"
-    path="/REF/STAR_2009_UE_HELEN" title="transMIN charged particle density">
+    path="/REF/STAR_2009_UE_HELEN" title="transMAX charged particle density">
+    <dimension dim="0" title="leading jet $p_T$" />
     <annotation>
-      <item key="Title" value="transMIN charged particle density" sticky="true"/>
+      <item key="Title" value="transMAX charged particle density" sticky="true"/>
       <item key="AidaPath" value="/REF/STAR_2009_UE_HELEN/d01-x01-y01" sticky="true"/>
       <item key="FullPath" value="/STAR_2009_UE_HELEN.aida/REF/STAR_2009_UE_HELEN/d01-x01-y01" sticky="true"/>
     </annotation>
     <dataPoint>
       <measurement errorPlus="2.500000e+00" value="7.500000e+00" errorMinus="2.500000e+00"/>
-      <measurement errorPlus="3.000000e-02" value="1.500000e-01" errorMinus="3.000000e-02"/>
+      <measurement errorPlus="1.340000e-01" value="6.700000e-01" errorMinus="1.340000e-01"/>
     </dataPoint>
     <dataPoint>
       <measurement errorPlus="2.500000e+00" value="1.250000e+01" errorMinus="2.500000e+00"/>
-      <measurement errorPlus="2.600000e-02" value="1.300000e-01" errorMinus="2.600000e-02"/>
+      <measurement errorPlus="1.240000e-01" value="6.200000e-01" errorMinus="1.240000e-01"/>
     </dataPoint>
     <dataPoint>
       <measurement errorPlus="2.500000e+00" value="1.750000e+01" errorMinus="2.500000e+00"/>
-      <measurement errorPlus="2.400000e-02" value="1.200000e-01" errorMinus="2.400000e-02"/>
+      <measurement errorPlus="1.200000e-01" value="6.000000e-01" errorMinus="1.200000e-01"/>
     </dataPoint>
     <dataPoint>
       <measurement errorPlus="2.500000e+00" value="2.250000e+01" errorMinus="2.500000e+00"/>
-      <measurement errorPlus="2.200000e-02" value="1.100000e-01" errorMinus="2.200000e-02"/>
+      <measurement errorPlus="1.140000e-01" value="5.700000e-01" errorMinus="1.140000e-01"/>
     </dataPoint>
     <dataPoint>
       <measurement errorPlus="2.500000e+00" value="2.750000e+01" errorMinus="2.500000e+00"/>
-      <measurement errorPlus="2.100000e-02" value="1.000000e-01" errorMinus="2.100000e-02"/>
+      <measurement errorPlus="1.120000e-01" value="5.600000e-01" errorMinus="1.120000e-01"/>
     </dataPoint>
     <dataPoint>
       <measurement errorPlus="2.500000e+00" value="3.250000e+01" errorMinus="2.500000e+00"/>
-      <measurement errorPlus="1.700000e-02" value="8.000000e-02" errorMinus="1.700000e-02"/>
+      <measurement errorPlus="1.040000e-01" value="5.100000e-01" errorMinus="1.040000e-01"/>
     </dataPoint>
     <dataPoint>
       <measurement errorPlus="2.500000e+00" value="3.750000e+01" errorMinus="2.500000e+00"/>
-      <measurement errorPlus="2.300000e-02" value="9.000000e-02" errorMinus="2.300000e-02"/>
+      <measurement errorPlus="1.080000e-01" value="5.000000e-01" errorMinus="1.080000e-01"/>
     </dataPoint>
   </dataPointSet>
   <dataPointSet name="d02-x01-y01" dimension="2"
-    path="/REF/STAR_2009_UE_HELEN" title="transMAX charged particle density">
+    path="/REF/STAR_2009_UE_HELEN" title="transMIN charged particle density">
+    <dimension dim="0" title="leading jet $p_T$" />
     <annotation>
-      <item key="Title" value="transMAX charged particle density" sticky="true"/>
+      <item key="Title" value="transMIN charged particle density" sticky="true"/>
       <item key="AidaPath" value="/REF/STAR_2009_UE_HELEN/d02-x01-y01" sticky="true"/>
       <item key="FullPath" value="/STAR_2009_UE_HELEN.aida/REF/STAR_2009_UE_HELEN/d02-x01-y01" sticky="true"/>
     </annotation>
     <dataPoint>
       <measurement errorPlus="2.500000e+00" value="7.500000e+00" errorMinus="2.500000e+00"/>
-      <measurement errorPlus="1.340000e-01" value="6.700000e-01" errorMinus="1.340000e-01"/>
+      <measurement errorPlus="3.000000e-02" value="1.500000e-01" errorMinus="3.000000e-02"/>
     </dataPoint>
     <dataPoint>
       <measurement errorPlus="2.500000e+00" value="1.250000e+01" errorMinus="2.500000e+00"/>
-      <measurement errorPlus="1.240000e-01" value="6.200000e-01" errorMinus="1.240000e-01"/>
+      <measurement errorPlus="2.600000e-02" value="1.300000e-01" errorMinus="2.600000e-02"/>
     </dataPoint>
     <dataPoint>
       <measurement errorPlus="2.500000e+00" value="1.750000e+01" errorMinus="2.500000e+00"/>
-      <measurement errorPlus="1.200000e-01" value="6.000000e-01" errorMinus="1.200000e-01"/>
+      <measurement errorPlus="2.400000e-02" value="1.200000e-01" errorMinus="2.400000e-02"/>
     </dataPoint>
     <dataPoint>
       <measurement errorPlus="2.500000e+00" value="2.250000e+01" errorMinus="2.500000e+00"/>
-      <measurement errorPlus="1.140000e-01" value="5.700000e-01" errorMinus="1.140000e-01"/>
+      <measurement errorPlus="2.200000e-02" value="1.100000e-01" errorMinus="2.200000e-02"/>
     </dataPoint>
     <dataPoint>
       <measurement errorPlus="2.500000e+00" value="2.750000e+01" errorMinus="2.500000e+00"/>
-      <measurement errorPlus="1.120000e-01" value="5.600000e-01" errorMinus="1.120000e-01"/>
+      <measurement errorPlus="2.100000e-02" value="1.000000e-01" errorMinus="2.100000e-02"/>
     </dataPoint>
     <dataPoint>
       <measurement errorPlus="2.500000e+00" value="3.250000e+01" errorMinus="2.500000e+00"/>
-      <measurement errorPlus="1.040000e-01" value="5.100000e-01" errorMinus="1.040000e-01"/>
+      <measurement errorPlus="1.700000e-02" value="8.000000e-02" errorMinus="1.700000e-02"/>
     </dataPoint>
     <dataPoint>
       <measurement errorPlus="2.500000e+00" value="3.750000e+01" errorMinus="2.500000e+00"/>
-      <measurement errorPlus="1.080000e-01" value="5.000000e-01" errorMinus="1.080000e-01"/>
+      <measurement errorPlus="2.300000e-02" value="9.000000e-02" errorMinus="2.300000e-02"/>
     </dataPoint>
   </dataPointSet>
   <dataPointSet name="d03-x01-y01" dimension="2"
     path="/REF/STAR_2009_UE_HELEN" title="away charged particle density">
+    <dimension dim="0" title="leading jet $p_T$" />
     <annotation>
       <item key="Title" value="away charged particle density" sticky="true"/>
       <item key="AidaPath" value="/REF/STAR_2009_UE_HELEN/d03-x01-y01" sticky="true"/>

Modified: trunk/data/refdata/STAR_2009_UE_HELEN.dat
==============================================================================
--- trunk/data/refdata/STAR_2009_UE_HELEN.dat	Thu Oct 15 12:54:02 2009	(r1907)
+++ trunk/data/refdata/STAR_2009_UE_HELEN.dat	Thu Oct 15 13:14:40 2009	(r1908)
@@ -70,20 +70,6 @@
 XLabel=leading jet $p_T$
 # END PLOT
 
-# BEGIN HISTOGRAM minueTrackSis
-Title=transMIN charged particle density
-XLabel=leading jet $p_T$
-LineColor=red
-ErrorBars=1
-5	10	0.15	0.030
-10	15	0.13	0.026
-15	20	0.12	0.024
-20	25	0.11	0.022
-25	30	0.10	0.021
-30	35	0.08	0.017
-35	40	0.09	0.023
-# END HISTOGRAM
-
 # BEGIN HISTOGRAM maxueTrackSis
 Title=transMAX charged particle density
 XLabel=leading jet $p_T$
@@ -98,6 +84,20 @@
 35	40	0.50	0.108
 # END HISTOGRAM
 
+# BEGIN HISTOGRAM minueTrackSis
+Title=transMIN charged particle density
+XLabel=leading jet $p_T$
+LineColor=red
+ErrorBars=1
+5	10	0.15	0.030
+10	15	0.13	0.026
+15	20	0.12	0.024
+20	25	0.11	0.022
+25	30	0.10	0.021
+30	35	0.08	0.017
+35	40	0.09	0.023
+# END HISTOGRAM
+
 # BEGIN HISTOGRAM awayTrackSis
 Title=away charged particle density
 XLabel=leading jet $p_T$

Modified: trunk/src/Analyses/Makefile.am
==============================================================================
--- trunk/src/Analyses/Makefile.am	Thu Oct 15 12:54:02 2009	(r1907)
+++ trunk/src/Analyses/Makefile.am	Thu Oct 15 13:14:40 2009	(r1908)
@@ -78,8 +78,8 @@
 lib_LTLIBRARIES += RivetRHICAnalyses.la
 RivetRHICAnalyses_la_SOURCES = \
     STAR_2006_S6870392.cc \
-    STAR_2008_S7993412.cc
-    #STAR_2009_UE_HELEN.cc
+    STAR_2008_S7993412.cc \
+    STAR_2009_UE_HELEN.cc
 
 
 lib_LTLIBRARIES += RivetSPSAnalyses.la

Modified: trunk/src/Analyses/STAR_2009_UE_HELEN.cc
==============================================================================
--- trunk/src/Analyses/STAR_2009_UE_HELEN.cc	Thu Oct 15 12:54:02 2009	(r1907)
+++ trunk/src/Analyses/STAR_2009_UE_HELEN.cc	Thu Oct 15 13:14:40 2009	(r1908)
@@ -11,158 +11,90 @@
 
   /* STAR underlying event
    * @author Hendrik Hoeth
-   */ 
+   */
   class STAR_2009_UE_HELEN : public Analysis {
   public:
 
     /// Constructor
     STAR_2009_UE_HELEN()
-      : Analysis("STAR_2009_UE_HELEN")  
+      : Analysis("STAR_2009_UE_HELEN")
     {
-      setBeams(PROTON, ANTIPROTON);
+      setBeams(PROTON, PROTON);
     }
 
 
-    /// TODO: make sure this goes into the .info file:
-
-    // /// @name Publication metadata
-    // //@{
-
-    // /// Analysis name
-    // string name() const {
-    //   return "STAR_2009_UE_HELEN";
-    // }
-    // /// SPIRES key (IRN)
-    // string spiresId() const {
-    //   return "NONE";
-    // }
-    // /// A short description of the analysis.
-    // string summary() const {
-    //   return "CDF Run 2 underlying event in leading jet events";
-    // }
-    // /// Full description of the analysis, for the manual
-    // string description() const {
-    //   ostringstream os;
-    //   os << "";
-    //   return os.str();
-    // }
-    // /// Experiment which performed and published this analysis.
-    // string experiment() const {
-    //  return "STAR";
-    // }
-    // /// Collider on which the experiment was based
-    // string collider() const {
-    //  return "(RHIC pp 200 GeV)";
-    // }
-    // /// When published according to SPIRES
-    // string year() const {
-    //  return "2008";
-    // }
-    // /// Names & emails of paper/analysis authors.
-    // vector<string> authors() const {
-    //   vector<string> ret;
-    //   ret += "Hendrik Hoeth <hendrik.hoeth at cern.ch>";
-    //   return ret;
-    // }
-    // /// Information about the events needed as input for this analysis.
-    // string runInfo() const {
-    //   ostringstream os;
-    //   os << "* pp interactions at 200 GeV";
-    //   return os.str();
-    // }
-
-    // string status() const {
-    //   return "UNVALIDATED";
-    // }
-    // /// No journal or preprint references.
-    // vector<string> references() const {
-    //   vector<string> ret;
-    //   ret += "";
-    //   return ret;
-    // }
-
-    // //@}
-    
-
     /// @name Analysis methods
     //@{
-    
-    /// Book projections and histograms
+
     void init() {
       // Final state for the jet finding
       const FinalState fsj(-4.0, 4.0, 0.0*GeV);
       addProjection(fsj, "FSJ");
-      /// @todo STAR doesn't really use a CDF midpoint algorithm!
-      addProjection(FastJets(fsj, FastJets::CDFMIDPOINT, 0.7), "Jets");
-      
-      // Final state for the sum(ET) distributions
-      const FinalState fs(-1.0, 1.0, 0.0*GeV);
-      addProjection(fs, "FS");
-      
+      /// @todo Check which merging parameter they've been using
+      addProjection(FastJets(fsj, FastJets::SISCONE, 0.7), "AllJets");
+
       // Charged final state for the distributions
-      const ChargedFinalState cfs(-1.0, 1.0, 0.5*GeV);
+      const ChargedFinalState cfs(-1.0, 1.0, 0.2*GeV);
       addProjection(cfs, "CFS");
 
-      // Histograms
-      _hist_pnchg      = bookProfile1D( 1, 1, 1);
-      _hist_pmaxnchg   = bookProfile1D( 2, 1, 1);
-      _hist_pminnchg   = bookProfile1D( 3, 1, 1);
-      _hist_pdifnchg   = bookProfile1D( 4, 1, 1);
-      _hist_pcptsum    = bookProfile1D( 5, 1, 1);
-      _hist_pmaxcptsum = bookProfile1D( 6, 1, 1);
-      _hist_pmincptsum = bookProfile1D( 7, 1, 1);
-      _hist_pdifcptsum = bookProfile1D( 8, 1, 1);
-      _hist_pcptave    = bookProfile1D( 9, 1, 1);
-      //_hist_onchg   = bookProfile1D( 1, 1, 1, "Overall number of charged particles");
-      //_hist_ocptsum = bookProfile1D( 2, 1, 1, "Overall charged $p_\\perp$ sum");
-      //_hist_oetsum  = bookProfile1D( 3, 1, 1, "Overall $E_\\perp$ sum");
+      // Book histograms
+      _hist_pmaxnchg   = bookProfile1D( 1, 1, 1);
+      _hist_pminnchg   = bookProfile1D( 2, 1, 1);
+      _hist_anchg      = bookProfile1D( 3, 1, 1);
     }
-    
-    
-    /// Do the analysis
+
+
+    // Do the analysis
     void analyze(const Event& e) {
       const FinalState& fsj = applyProjection<FinalState>(e, "FSJ");
       if (fsj.particles().size() < 1) {
         getLog() << Log::DEBUG << "Failed multiplicity cut" << endl;
         vetoEvent;
       }
-      
-      const Jets jets = applyProjection<FastJets>(e, "Jets").jetsByPt();
-      getLog() << Log::DEBUG << "Jet multiplicity = " << jets.size() << endl;
-      
+
+      const Jets& alljets = applyProjection<FastJets>(e, "AllJets").jetsByPt();
+      getLog() << Log::DEBUG << "Total jet multiplicity = " << alljets.size() << endl;
+
+      Jets jets;
+      foreach (const Jet jet, alljets) {
+        if (jet.neutralEnergy() < 0.7)
+          jets.push_back(jet);
+      }
+
       // We require the leading jet to be within |eta|<2
       if (jets.size() < 1 || fabs(jets[0].momentum().eta()) >= 2) {
         getLog() << Log::DEBUG << "Failed jet cut" << endl;
         vetoEvent;
       }
-      
+
       const double jetphi = jets[0].momentum().phi();
       const double jetpT  = jets[0].momentum().pT();
-      
+
       // Get the event weight
       const double weight = e.weight();
-      
+
       // Get the final states to work with for filling the distributions
       const FinalState& cfs = applyProjection<ChargedFinalState>(e, "CFS");
-      
-      size_t   numOverall(0),     numToward(0),     numTrans1(0),     numTrans2(0),     numAway(0)  ;
+
+      size_t numOverall(0),     numToward(0),     numTrans1(0),     numTrans2(0),     numAway(0)  ;
       double ptSumOverall(0.0), ptSumToward(0.0), ptSumTrans1(0.0), ptSumTrans2(0.0), ptSumAway(0.0);
       //double EtSumOverall(0.0), EtSumToward(0.0), EtSumTrans1(0.0), EtSumTrans2(0.0), EtSumAway(0.0);
       double ptMaxOverall(0.0), ptMaxToward(0.0), ptMaxTrans1(0.0), ptMaxTrans2(0.0), ptMaxAway(0.0);
-      
+
       // Calculate all the charged stuff
       foreach (const Particle& p, cfs.particles()) {
         const double dPhi = deltaPhi(p.momentum().phi(), jetphi);
         const double pT = p.momentum().pT();
         const double phi = p.momentum().phi();
-        /// @todo Jet and particle phi should have same ranges this way: check
-        const double rotatedphi = phi - jetphi;
-        
+        double rotatedphi = phi - jetphi;
+        while (rotatedphi < 0) rotatedphi += 2*PI;
+
         ptSumOverall += pT;
         ++numOverall;
-        if (pT > ptMaxOverall)
+        if (pT > ptMaxOverall) {
           ptMaxOverall = pT;
-        
+        }
+
         if (dPhi < PI/3.0) {
           ptSumToward += pT;
           ++numToward;
@@ -190,91 +122,37 @@
             ptMaxAway = pT;
         }
       } // end charged particle loop
-      
-      
-      #if 0   
-      /// @todo Enable this part when we have the numbers from Rick Field
-      
-      // And now the same business for all particles (including neutrals)
-      foreach (const Particle& p, fs.particles()) {
-        const double dPhi = deltaPhi(p.momentum().phi(), jetphi);
-        const double ET = p.momentum().Et();
-        const double phi = p.momentum().phi();
-        const double rotatedphi = phi - jetphi;
-        
-        EtSumOverall += ET;
-        
-        if (dPhi < PI/3.0) {
-          EtSumToward += ET;
-        }
-        else if (dPhi < 2*PI/3.0) {
-          if (rotatedphi <= PI) {
-            EtSumTrans1 += ET;
-          }
-          else {
-            EtSumTrans2 += ET;
-          }
-        }
-        else {
-          EtSumAway += ET;
-        }
-      } // end all particle loop
-      #endif
-      
-      
+
+
+
       // Fill the histograms
-      //_hist_tnchg->fill(jetpT, numToward/(4*PI/3), weight);
-      _hist_pnchg->fill(jetpT, (numTrans1+numTrans2)/(4*PI/3), weight);
-      _hist_pmaxnchg->fill(jetpT, (numTrans1>numTrans2 ? numTrans1 : numTrans2)/(2*PI/3), weight);
-      _hist_pminnchg->fill(jetpT, (numTrans1<numTrans2 ? numTrans1 : numTrans2)/(2*PI/3), weight);
-      _hist_pdifnchg->fill(jetpT, abs(numTrans1-numTrans2)/(2*PI/3), weight);
-      //_hist_anchg->fill(jetpT, numAway/(4*PI/3), weight);
-      
-      //_hist_tcptsum->fill(jetpT, ptSumToward/(4*PI/3), weight);
-      _hist_pcptsum->fill(jetpT, (ptSumTrans1+ptSumTrans2)/(4*PI/3), weight);
-      _hist_pmaxcptsum->fill(jetpT, (ptSumTrans1>ptSumTrans2 ? ptSumTrans1 : ptSumTrans2)/(2*PI/3), weight);
-      _hist_pmincptsum->fill(jetpT, (ptSumTrans1<ptSumTrans2 ? ptSumTrans1 : ptSumTrans2)/(2*PI/3), weight);
-      _hist_pdifcptsum->fill(jetpT, fabs(ptSumTrans1-ptSumTrans2)/(2*PI/3), weight);
-      //_hist_acptsum->fill(jetpT, ptSumAway/(4*PI/3), weight);
-      
-      //if (numToward > 0) {
-      //  _hist_tcptave->fill(jetpT, ptSumToward/numToward, weight);
-      //  _hist_tcptmax->fill(jetpT, ptMaxToward, weight);
-      //}
-      if ((numTrans1+numTrans2) > 0) {
-        _hist_pcptave->fill(jetpT, (ptSumTrans1+ptSumTrans2)/(numTrans1+numTrans2), weight);
-        //_hist_pcptmax->fill(jetpT, (ptMaxTrans1 > ptMaxTrans2 ? ptMaxTrans1 : ptMaxTrans2), weight);
-      }
-      //if (numAway > 0) {
-      //  _hist_acptave->fill(jetpT, ptSumAway/numAway, weight);
-      //  _hist_acptmax->fill(jetpT, ptMaxAway, weight);
-      //}
+      // @TODO: TAKE OUT THE 0.8 SCALE FACTOR WHEN WE GET THE FINAL DATA!!!!!!
+      const double efficiency = 0.8;
+      _hist_pmaxnchg->fill(jetpT, efficiency*(numTrans1>numTrans2 ? numTrans1 : numTrans2)/(2*PI/3), weight);
+      _hist_pminnchg->fill(jetpT, efficiency*(numTrans1<numTrans2 ? numTrans1 : numTrans2)/(2*PI/3), weight);
+      _hist_anchg->fill(jetpT, efficiency*numAway/(PI*0.7*0.7), weight); // jet area = pi*R^2
+
     }
-    
-    
-    void finalize() {  
+
+
+    void finalize() {
       //
     }
 
     //@}
 
+
   private:
 
-    AIDA::IProfile1D *_hist_pnchg;
     AIDA::IProfile1D *_hist_pmaxnchg;
     AIDA::IProfile1D *_hist_pminnchg;
-    AIDA::IProfile1D *_hist_pdifnchg;
-    AIDA::IProfile1D *_hist_pcptsum;
-    AIDA::IProfile1D *_hist_pmaxcptsum;
-    AIDA::IProfile1D *_hist_pmincptsum;
-    AIDA::IProfile1D *_hist_pdifcptsum;
-    AIDA::IProfile1D *_hist_pcptave;
+    AIDA::IProfile1D *_hist_anchg;
 
   };
 
-  
-  
+
+
   // This global object acts as a hook for the plugin system
   AnalysisBuilder<STAR_2009_UE_HELEN> plugin_STAR_2009_UE_HELEN;
-  
+
 }


More information about the Rivet-svn mailing list