|
|
[Rivet-svn] r4143 - in trunk: . data/anainfo data/plotinfo data/refdata src/Analyses
blackhole at projects.hepforge.org
blackhole at projects.hepforge.org
Thu Feb 14 11:53:55 GMT 2013
Author: hoeth
Date: Thu Feb 14 11:53:55 2013
New Revision: 4143
Log:
merge r4057 from branches/2012-06-aidarivet
Added:
trunk/data/anainfo/ATLAS_2012_I1188891.info
- copied unchanged from r4057, branches/2012-06-aidarivet/data/anainfo/ATLAS_2012_I1188891.info
trunk/data/plotinfo/ATLAS_2012_I1188891.plot
- copied unchanged from r4057, branches/2012-06-aidarivet/data/plotinfo/ATLAS_2012_I1188891.plot
trunk/data/refdata/ATLAS_2012_I1188891.aida
- copied unchanged from r4057, branches/2012-06-aidarivet/data/refdata/ATLAS_2012_I1188891.aida
trunk/src/Analyses/ATLAS_2012_I1188891.cc
- copied, changed from r4057, branches/2012-06-aidarivet/src/Analyses/ATLAS_2012_I1188891.cc
Modified:
trunk/ChangeLog
trunk/data/anainfo/Makefile.am
trunk/data/plotinfo/Makefile.am
trunk/data/refdata/Makefile.am
trunk/src/Analyses/Makefile.am
Modified: trunk/ChangeLog
==============================================================================
--- trunk/ChangeLog Thu Feb 14 10:10:30 2013 (r4142)
+++ trunk/ChangeLog Thu Feb 14 11:53:55 2013 (r4143)
@@ -20,6 +20,10 @@
* Fix TeX variable in the rivetenv scripts, especially for csh
+2012-12-06 Hendrik Hoeth <hendrik.hoeth at cern.ch>
+
+ * Added ATLAS_2012_I1188891 analysis
+
2012-11-27 Andy Buckley <andy.buckley at cern.ch>
* Converting CMS_2012_I1102908 analysis to use YODA.
Copied: trunk/data/anainfo/ATLAS_2012_I1188891.info (from r4057, branches/2012-06-aidarivet/data/anainfo/ATLAS_2012_I1188891.info)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/data/anainfo/ATLAS_2012_I1188891.info Thu Feb 14 11:53:55 2013 (r4143, copy of r4057, branches/2012-06-aidarivet/data/anainfo/ATLAS_2012_I1188891.info)
@@ -0,0 +1,41 @@
+Name: ATLAS_2012_I1188891
+Year: 2012
+Summary: flavour composition of dijet events at 7 TeV
+Experiment: ATLAS
+Collider: LHC 7TeV
+InspireID: 1188891
+Status: VALIDATED
+Authors:
+ - Cecile Lapoire <clapoire at cern.ch>
+ - Roman Lysak <lysak at fzu.cz>
+References:
+ - arXiv:1210.0441
+RunInfo:
+ pp di-jet events at 7 TeV
+NumEvents: 1000000
+NeedCrossSection: no
+Beams: [p+, p+]
+Energies: [7000]
+Description:
+ 'The measurement of the flavour composition of dijet events produced
+ in pp collisions at $\sqrt{s}=7 TeV$ using the ATLAS detector.
+ Six possible combinations of light, charm and bottom jets are identified
+ in the dijet events, where the jet flavour is defined by the presence
+ of bottom, charm or solely light flavour hadrons in the jet.
+ The fractions of these dijet flavour states as functions of the leading
+ jet transverse momentum in the range 40 GeV to 500 GeV and jet
+ rapidity $|y| < 2.1$ are measured.'
+BibKey: Aad:2012ma
+BibTeX: '@article{Aad:2012ma,
+ author = "Aad, Georges and others",
+ title = "{Measurement of the flavour composition of dijet events
+ in $pp$ collisions at $\sqrt{s}=7$ TeV with the ATLAS
+ detector}",
+ collaboration = "ATLAS Collaboration",
+ year = "2012",
+ eprint = "1210.0441",
+ archivePrefix = "arXiv",
+ primaryClass = "hep-ex",
+ SLACcitation = "%%CITATION = ARXIV:1210.0441;%%",
+}'
+
Modified: trunk/data/anainfo/Makefile.am
==============================================================================
--- trunk/data/anainfo/Makefile.am Thu Feb 14 10:10:30 2013 (r4142)
+++ trunk/data/anainfo/Makefile.am Thu Feb 14 11:53:55 2013 (r4143)
@@ -55,6 +55,7 @@
ATLAS_2012_I1082009.info \
ATLAS_2012_I1091481.info \
ATLAS_2012_I1183818.info \
+ ATLAS_2012_I1188891.info \
ATLAS_2012_I946427.info \
ATLAS_2012_CONF_2012_001.info \
ATLAS_2012_I1112263.info \
Copied: trunk/data/plotinfo/ATLAS_2012_I1188891.plot (from r4057, branches/2012-06-aidarivet/data/plotinfo/ATLAS_2012_I1188891.plot)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/data/plotinfo/ATLAS_2012_I1188891.plot Thu Feb 14 11:53:55 2013 (r4143, copy of r4057, branches/2012-06-aidarivet/data/plotinfo/ATLAS_2012_I1188891.plot)
@@ -0,0 +1,28 @@
+# BEGIN PLOT /ATLAS_2012_I1188891/d0
+XLabel=Leading jet $p_\perp$~[GeV]
+LogY=0
+# END PLOT
+
+# BEGIN PLOT /ATLAS_2012_I1188891/d01-x01-y01
+YLabel=$bb$ fraction [\%]
+# END PLOT
+
+# BEGIN PLOT /ATLAS_2012_I1188891/d02-x01-y01
+YLabel=$bc$ fraction [\%]
+# END PLOT
+
+# BEGIN PLOT /ATLAS_2012_I1188891/d03-x01-y01
+YLabel=$cc$ fraction [\%]
+# END PLOT
+
+# BEGIN PLOT /ATLAS_2012_I1188891/d04-x01-y01
+YLabel=$b$-light fraction [\%]
+# END PLOT
+
+# BEGIN PLOT /ATLAS_2012_I1188891/d05-x01-y01
+YLabel=$c$-light fraction [\%]
+# END PLOT
+
+# BEGIN PLOT /ATLAS_2012_I1188891/d06-x01-y01
+YLabel=light-light fraction [\%]
+# END PLOT
Modified: trunk/data/plotinfo/Makefile.am
==============================================================================
--- trunk/data/plotinfo/Makefile.am Thu Feb 14 10:10:30 2013 (r4142)
+++ trunk/data/plotinfo/Makefile.am Thu Feb 14 11:53:55 2013 (r4143)
@@ -59,6 +59,7 @@
ATLAS_2012_I1180197.plot \
ATLAS_2012_I1082009.plot \
ATLAS_2012_I1183818.plot \
+ ATLAS_2012_I1188891.plot \
ATLAS_2012_I1186556.plot \
ATLAS_2012_I1190891.plot \
ATLAS_2012_CONF_2012_103.plot \
Copied: trunk/data/refdata/ATLAS_2012_I1188891.aida (from r4057, branches/2012-06-aidarivet/data/refdata/ATLAS_2012_I1188891.aida)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/data/refdata/ATLAS_2012_I1188891.aida Thu Feb 14 11:53:55 2013 (r4143, copy of r4057, branches/2012-06-aidarivet/data/refdata/ATLAS_2012_I1188891.aida)
@@ -0,0 +1,191 @@
+<?xml version="1.0" ?>
+<!DOCTYPE aida SYSTEM "http://aida.freehep.org/schemas/3.3/aida.dtd">
+<aida version="3.3">
+ <implementation version="1.1" package="Rivet"/>
+ <dataPointSet name="d01-x01-y01" dimension="2"
+ path="/REF/ATLAS_2012_I1188891" title="">
+ <annotation>
+ <item key="Title" value="" sticky="true"/>
+ <item key="AidaPath" value="/REF/ATLAS_2012_I1188891/d01-x01-y01" sticky="true"/>
+ </annotation>
+ <dataPoint>
+ <measurement errorPlus="1.000000e+01" value="5.000000e+01" errorMinus="1.000000e+01"/>
+ <measurement errorPlus="1.264910e-01" value="6.500000e-01" errorMinus="1.264910e-01"/>
+ </dataPoint>
+ <dataPoint>
+ <measurement errorPlus="1.000000e+01" value="7.000000e+01" errorMinus="1.000000e+01"/>
+ <measurement errorPlus="1.170470e-01" value="6.300000e-01" errorMinus="1.170470e-01"/>
+ </dataPoint>
+ <dataPoint>
+ <measurement errorPlus="2.000000e+01" value="1.000000e+02" errorMinus="2.000000e+01"/>
+ <measurement errorPlus="1.118030e-01" value="5.800000e-01" errorMinus="1.118030e-01"/>
+ </dataPoint>
+ <dataPoint>
+ <measurement errorPlus="2.000000e+01" value="1.400000e+02" errorMinus="2.000000e+01"/>
+ <measurement errorPlus="1.044030e-01" value="6.100000e-01" errorMinus="1.044030e-01"/>
+ </dataPoint>
+ <dataPoint>
+ <measurement errorPlus="4.500000e+01" value="2.050000e+02" errorMinus="4.500000e+01"/>
+ <measurement errorPlus="8.602330e-02" value="5.800000e-01" errorMinus="8.602330e-02"/>
+ </dataPoint>
+ <dataPoint>
+ <measurement errorPlus="1.250000e+02" value="3.750000e+02" errorMinus="1.250000e+02"/>
+ <measurement errorPlus="1.000000e-01" value="3.900000e-01" errorMinus="1.000000e-01"/>
+ </dataPoint>
+ </dataPointSet>
+ <dataPointSet name="d02-x01-y01" dimension="2"
+ path="/REF/ATLAS_2012_I1188891" title="">
+ <annotation>
+ <item key="Title" value="" sticky="true"/>
+ <item key="AidaPath" value="/REF/ATLAS_2012_I1188891/d02-x01-y01" sticky="true"/>
+ </annotation>
+ <dataPoint>
+ <measurement errorPlus="1.000000e+01" value="5.000000e+01" errorMinus="1.000000e+01"/>
+ <measurement errorPlus="2.343070e-01" value="4.900000e-01" errorMinus="2.343070e-01"/>
+ </dataPoint>
+ <dataPoint>
+ <measurement errorPlus="1.000000e+01" value="7.000000e+01" errorMinus="1.000000e+01"/>
+ <measurement errorPlus="2.220360e-01" value="3.100000e-01" errorMinus="2.220360e-01"/>
+ </dataPoint>
+ <dataPoint>
+ <measurement errorPlus="2.000000e+01" value="1.000000e+02" errorMinus="2.000000e+01"/>
+ <measurement errorPlus="2.061550e-01" value="5.300000e-01" errorMinus="2.061550e-01"/>
+ </dataPoint>
+ <dataPoint>
+ <measurement errorPlus="2.000000e+01" value="1.400000e+02" errorMinus="2.000000e+01"/>
+ <measurement errorPlus="2.376970e-01" value="5.200000e-01" errorMinus="2.376970e-01"/>
+ </dataPoint>
+ <dataPoint>
+ <measurement errorPlus="4.500000e+01" value="2.050000e+02" errorMinus="4.500000e+01"/>
+ <measurement errorPlus="2.941090e-01" value="2.800000e-01" errorMinus="2.941090e-01"/>
+ </dataPoint>
+ <dataPoint>
+ <measurement errorPlus="1.250000e+02" value="3.750000e+02" errorMinus="1.250000e+02"/>
+ <measurement errorPlus="4.326660e-01" value="9.300000e-01" errorMinus="4.326660e-01"/>
+ </dataPoint>
+ </dataPointSet>
+ <dataPointSet name="d03-x01-y01" dimension="2"
+ path="/REF/ATLAS_2012_I1188891" title="">
+ <annotation>
+ <item key="Title" value="" sticky="true"/>
+ <item key="AidaPath" value="/REF/ATLAS_2012_I1188891/d03-x01-y01" sticky="true"/>
+ </annotation>
+ <dataPoint>
+ <measurement errorPlus="1.000000e+01" value="5.000000e+01" errorMinus="1.000000e+01"/>
+ <measurement errorPlus="4.313930e-01" value="1.080000e+00" errorMinus="4.313930e-01"/>
+ </dataPoint>
+ <dataPoint>
+ <measurement errorPlus="1.000000e+01" value="7.000000e+01" errorMinus="1.000000e+01"/>
+ <measurement errorPlus="4.393180e-01" value="1.510000e+00" errorMinus="4.393180e-01"/>
+ </dataPoint>
+ <dataPoint>
+ <measurement errorPlus="2.000000e+01" value="1.000000e+02" errorMinus="2.000000e+01"/>
+ <measurement errorPlus="3.008320e-01" value="1.030000e+00" errorMinus="3.008320e-01"/>
+ </dataPoint>
+ <dataPoint>
+ <measurement errorPlus="2.000000e+01" value="1.400000e+02" errorMinus="2.000000e+01"/>
+ <measurement errorPlus="2.729470e-01" value="8.600000e-01" errorMinus="2.729470e-01"/>
+ </dataPoint>
+ <dataPoint>
+ <measurement errorPlus="4.500000e+01" value="2.050000e+02" errorMinus="4.500000e+01"/>
+ <measurement errorPlus="5.325410e-01" value="1.680000e+00" errorMinus="5.325410e-01"/>
+ </dataPoint>
+ <dataPoint>
+ <measurement errorPlus="1.250000e+02" value="3.750000e+02" errorMinus="1.250000e+02"/>
+ <measurement errorPlus="6.862220e-01" value="7.000000e-01" errorMinus="6.862220e-01"/>
+ </dataPoint>
+ </dataPointSet>
+ <dataPointSet name="d04-x01-y01" dimension="2"
+ path="/REF/ATLAS_2012_I1188891" title="">
+ <annotation>
+ <item key="Title" value="" sticky="true"/>
+ <item key="AidaPath" value="/REF/ATLAS_2012_I1188891/d04-x01-y01" sticky="true"/>
+ </annotation>
+ <dataPoint>
+ <measurement errorPlus="1.000000e+01" value="5.000000e+01" errorMinus="1.000000e+01"/>
+ <measurement errorPlus="4.712750e-01" value="4.070000e+00" errorMinus="4.712750e-01"/>
+ </dataPoint>
+ <dataPoint>
+ <measurement errorPlus="1.000000e+01" value="7.000000e+01" errorMinus="1.000000e+01"/>
+ <measurement errorPlus="4.808330e-01" value="4.780000e+00" errorMinus="4.808330e-01"/>
+ </dataPoint>
+ <dataPoint>
+ <measurement errorPlus="2.000000e+01" value="1.000000e+02" errorMinus="2.000000e+01"/>
+ <measurement errorPlus="5.458940e-01" value="5.430000e+00" errorMinus="5.458940e-01"/>
+ </dataPoint>
+ <dataPoint>
+ <measurement errorPlus="2.000000e+01" value="1.400000e+02" errorMinus="2.000000e+01"/>
+ <measurement errorPlus="5.277310e-01" value="6.020000e+00" errorMinus="5.277310e-01"/>
+ </dataPoint>
+ <dataPoint>
+ <measurement errorPlus="4.500000e+01" value="2.050000e+02" errorMinus="4.500000e+01"/>
+ <measurement errorPlus="4.531000e-01" value="6.550000e+00" errorMinus="4.531000e-01"/>
+ </dataPoint>
+ <dataPoint>
+ <measurement errorPlus="1.250000e+02" value="3.750000e+02" errorMinus="1.250000e+02"/>
+ <measurement errorPlus="5.953990e-01" value="6.690000e+00" errorMinus="5.953990e-01"/>
+ </dataPoint>
+ </dataPointSet>
+ <dataPointSet name="d05-x01-y01" dimension="2"
+ path="/REF/ATLAS_2012_I1188891" title="">
+ <annotation>
+ <item key="Title" value="" sticky="true"/>
+ <item key="AidaPath" value="/REF/ATLAS_2012_I1188891/d05-x01-y01" sticky="true"/>
+ </annotation>
+ <dataPoint>
+ <measurement errorPlus="1.000000e+01" value="5.000000e+01" errorMinus="1.000000e+01"/>
+ <measurement errorPlus="1.772000e+00" value="1.060000e+01" errorMinus="1.772000e+00"/>
+ </dataPoint>
+ <dataPoint>
+ <measurement errorPlus="1.000000e+01" value="7.000000e+01" errorMinus="1.000000e+01"/>
+ <measurement errorPlus="1.392840e+00" value="1.030000e+01" errorMinus="1.392840e+00"/>
+ </dataPoint>
+ <dataPoint>
+ <measurement errorPlus="2.000000e+01" value="1.000000e+02" errorMinus="2.000000e+01"/>
+ <measurement errorPlus="1.520690e+00" value="1.130000e+01" errorMinus="1.520690e+00"/>
+ </dataPoint>
+ <dataPoint>
+ <measurement errorPlus="2.000000e+01" value="1.400000e+02" errorMinus="2.000000e+01"/>
+ <measurement errorPlus="1.815930e+00" value="1.090000e+01" errorMinus="1.815930e+00"/>
+ </dataPoint>
+ <dataPoint>
+ <measurement errorPlus="4.500000e+01" value="2.050000e+02" errorMinus="4.500000e+01"/>
+ <measurement errorPlus="2.061550e+00" value="1.100000e+01" errorMinus="2.061550e+00"/>
+ </dataPoint>
+ <dataPoint>
+ <measurement errorPlus="1.250000e+02" value="3.750000e+02" errorMinus="1.250000e+02"/>
+ <measurement errorPlus="2.912040e+00" value="1.240000e+01" errorMinus="2.912040e+00"/>
+ </dataPoint>
+ </dataPointSet>
+ <dataPointSet name="d06-x01-y01" dimension="2"
+ path="/REF/ATLAS_2012_I1188891" title="">
+ <annotation>
+ <item key="Title" value="" sticky="true"/>
+ <item key="AidaPath" value="/REF/ATLAS_2012_I1188891/d06-x01-y01" sticky="true"/>
+ </annotation>
+ <dataPoint>
+ <measurement errorPlus="1.000000e+01" value="5.000000e+01" errorMinus="1.000000e+01"/>
+ <measurement errorPlus="2.088060e+00" value="8.310000e+01" errorMinus="2.088060e+00"/>
+ </dataPoint>
+ <dataPoint>
+ <measurement errorPlus="1.000000e+01" value="7.000000e+01" errorMinus="1.000000e+01"/>
+ <measurement errorPlus="1.772000e+00" value="8.240000e+01" errorMinus="1.772000e+00"/>
+ </dataPoint>
+ <dataPoint>
+ <measurement errorPlus="2.000000e+01" value="1.000000e+02" errorMinus="2.000000e+01"/>
+ <measurement errorPlus="1.824830e+00" value="8.120000e+01" errorMinus="1.824830e+00"/>
+ </dataPoint>
+ <dataPoint>
+ <measurement errorPlus="2.000000e+01" value="1.400000e+02" errorMinus="2.000000e+01"/>
+ <measurement errorPlus="2.022370e+00" value="8.110000e+01" errorMinus="2.022370e+00"/>
+ </dataPoint>
+ <dataPoint>
+ <measurement errorPlus="4.500000e+01" value="2.050000e+02" errorMinus="4.500000e+01"/>
+ <measurement errorPlus="2.473860e+00" value="8.000000e+01" errorMinus="2.473860e+00"/>
+ </dataPoint>
+ <dataPoint>
+ <measurement errorPlus="1.250000e+02" value="3.750000e+02" errorMinus="1.250000e+02"/>
+ <measurement errorPlus="3.710800e+00" value="7.890000e+01" errorMinus="3.710800e+00"/>
+ </dataPoint>
+ </dataPointSet>
+</aida>
Modified: trunk/data/refdata/Makefile.am
==============================================================================
--- trunk/data/refdata/Makefile.am Thu Feb 14 10:10:30 2013 (r4142)
+++ trunk/data/refdata/Makefile.am Thu Feb 14 11:53:55 2013 (r4143)
@@ -54,6 +54,7 @@
ATLAS_2012_I943401.aida \
ATLAS_2012_I1082009.aida \
ATLAS_2012_I1183818.aida \
+ ATLAS_2012_I1188891.aida \
ATLAS_2012_CONF_2012_001.aida \
ATLAS_2013_I1217867.aida \
BABAR_2005_S6181155.aida \
Copied and modified: trunk/src/Analyses/ATLAS_2012_I1188891.cc (from r4057, branches/2012-06-aidarivet/src/Analyses/ATLAS_2012_I1188891.cc)
==============================================================================
--- branches/2012-06-aidarivet/src/Analyses/ATLAS_2012_I1188891.cc Thu Dec 6 10:41:12 2012 (r4057, copy source)
+++ trunk/src/Analyses/ATLAS_2012_I1188891.cc Thu Feb 14 11:53:55 2013 (r4143)
@@ -1,11 +1,10 @@
// -*- C++ -*-
#include "Rivet/Analysis.hh"
-#include "Rivet/RivetAIDA.hh"
+#include "Rivet/RivetYODA.hh"
#include "Rivet/Tools/Logging.hh"
#include "Rivet/Projections/FastJets.hh"
#include "Rivet/Tools/BinnedHistogram.hh"
#include "Rivet/Projections/ChargedFinalState.hh"
-#include "LWH/Histogram1D.h"
#include "Rivet/Tools/ParticleIdUtils.hh"
#include "Rivet/Particle.hh"
@@ -34,19 +33,12 @@
FastJets fj04(fs, FastJets::ANTIKT, 0.4);
addProjection(fj04, "AntiKT04");
- //double xbins[7] = { 40.,60.,80.,120.,160.,250.,500. };
- vector<double> xbins;
- xbins.push_back(40.);
- xbins.push_back(60.);
- xbins.push_back(80.);
- xbins.push_back(120.);
- xbins.push_back(160.);
- xbins.push_back(250.);
- xbins.push_back(500.);
-
string histotitle[7]={"BBfraction","BCfraction","CCfraction","BUfraction","CUfraction","UUfraction","Total"};
for (int i = 0 ; i < 7 ; i++){
- _fracHistos[i] = bookHistogram1D(histotitle[i],xbins);
+ _h_temp[i] = bookHisto1D(1, 1, 1, histotitle[i]);
+ if (i < 6) {
+ _h_results[i] = bookScatter2D(i+1, 1, 1);
+ }
}
}
@@ -135,47 +127,41 @@
bool isDijet = c_ljpt & c_nljpt & c_dphi;
if (!isDijet) vetoEvent;
- _fracHistos[6]->fill(leadjets[0].pT(), weight);
+ _h_temp[6]->fill(leadjets[0].pT(), weight);
if (flav[0]==5 && flav[1]==5) // BB dijet
- _fracHistos[0]->fill(leadjets[0].pT(), weight100);
+ _h_temp[0]->fill(leadjets[0].pT(), weight100);
if ((flav[0]==5 && flav[1]==4) || (flav[0]==4 && flav[1]==5)) // BC dijet
- _fracHistos[1]->fill(leadjets[0].pT(), weight100);
+ _h_temp[1]->fill(leadjets[0].pT(), weight100);
if (flav[0]==4 && flav[1]==4) // CC dijet
- _fracHistos[2]->fill(leadjets[0].pT(), weight100);
+ _h_temp[2]->fill(leadjets[0].pT(), weight100);
if ((flav[0]==5 && flav[1]==1) || (flav[0]==1 && flav[1]==5)) // B-light dijet
- _fracHistos[3]->fill(leadjets[0].pT(), weight100);
+ _h_temp[3]->fill(leadjets[0].pT(), weight100);
if ((flav[0]==4 && flav[1]==1) || (flav[0]==1 && flav[1]==4)) // C-light dijet
- _fracHistos[4]->fill(leadjets[0].pT(), weight100);
+ _h_temp[4]->fill(leadjets[0].pT(), weight100);
if (flav[0]==1 && flav[1]==1) // light-light dijet
- _fracHistos[5]->fill(leadjets[0].pT(), weight100);
+ _h_temp[5]->fill(leadjets[0].pT(), weight100);
}
void finalize() {
- AIDA::IHistogramFactory& hf = histogramFactory();
-
- hf.divide( histoPath(1,1,1), *_fracHistos[0], *_fracHistos[6]);
- hf.divide( histoPath(2,1,1), *_fracHistos[1], *_fracHistos[6]);
- hf.divide( histoPath(3,1,1), *_fracHistos[2], *_fracHistos[6]);
- hf.divide( histoPath(4,1,1), *_fracHistos[3], *_fracHistos[6]);
- hf.divide( histoPath(5,1,1), *_fracHistos[4], *_fracHistos[6]);
- hf.divide( histoPath(6,1,1), *_fracHistos[5], *_fracHistos[6]);
-
- // remove temporary histograms
- for (size_t i=0; i<7; i++) {
- hf.destroy(_fracHistos[i]);
- }
+ divide(_h_temp[0], _h_temp[6], _h_results[1]);
+ divide(_h_temp[1], _h_temp[6], _h_results[2]);
+ divide(_h_temp[2], _h_temp[6], _h_results[3]);
+ divide(_h_temp[3], _h_temp[6], _h_results[4]);
+ divide(_h_temp[4], _h_temp[6], _h_results[5]);
+ divide(_h_temp[5], _h_temp[6], _h_results[6]);
}
private:
- AIDA::IHistogram1D * _fracHistos[7];
+ Histo1DPtr _h_temp[7];
+ Scatter2DPtr _h_results[6];
};
DECLARE_RIVET_PLUGIN(ATLAS_2012_I1188891);
Modified: trunk/src/Analyses/Makefile.am
==============================================================================
--- trunk/src/Analyses/Makefile.am Thu Feb 14 10:10:30 2013 (r4142)
+++ trunk/src/Analyses/Makefile.am Thu Feb 14 11:53:55 2013 (r4143)
@@ -81,6 +81,7 @@
ATLAS_2012_I1117704.cc \
ATLAS_2012_I1125961.cc \
ATLAS_2012_I1183818.cc \
+ ATLAS_2012_I1188891.cc \
ATLAS_2013_I1217867.cc
if ENABLE_PRELIMINARY
RivetATLASAnalyses_la_SOURCES += \
More information about the Rivet-svn
mailing list
|