|
[Rivet-svn] r3616 - in branches/2011-07-aida2yoda: data/anainfo include/Rivet/Math src/Analysesblackhole at projects.hepforge.org blackhole at projects.hepforge.orgFri Mar 16 15:41:04 GMT 2012
Author: hoeth Date: Fri Mar 16 15:41:03 2012 New Revision: 3616 Log: merge c3562-3565 from trunk Modified: branches/2011-07-aida2yoda/data/anainfo/ATLAS_2011_CONF_2011_090.info branches/2011-07-aida2yoda/data/anainfo/ATLAS_2011_CONF_2011_098.info branches/2011-07-aida2yoda/data/anainfo/ATLAS_2011_S8971293.info branches/2011-07-aida2yoda/data/anainfo/ATLAS_2011_S8983313.info branches/2011-07-aida2yoda/data/anainfo/ATLAS_2011_S9019561.info branches/2011-07-aida2yoda/data/anainfo/ATLAS_2011_S9212183.info branches/2011-07-aida2yoda/data/anainfo/ATLAS_2011_S9225137.info branches/2011-07-aida2yoda/include/Rivet/Math/MathUtils.hh branches/2011-07-aida2yoda/src/Analyses/ALEPH_1999_S4193598.cc 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 Fri Mar 16 15:39:17 2012 (r3615) +++ branches/2011-07-aida2yoda/data/anainfo/ATLAS_2011_CONF_2011_090.info Fri Mar 16 15:41:03 2012 (r3616) @@ -1,9 +1,9 @@ Name: ATLAS_2011_CONF_2011_090 Year: 2011 -Summary: Single Lepton Search for Supersymmetry +Summary: Single lepton search for supersymmetry Experiment: ATLAS Collider: LHC -SpiresID: +SpiresID: Status: VALIDATED Authors: - Angela Chen <aqchen at fas.harvard.edu> @@ -15,8 +15,8 @@ Beams: [p+, p+] Energies: [7000] Description: - 'Single lepton search for supersymmmetric particles by ATLAS at 7 TeV. + 'Single lepton search for supersymmmetric particles by ATLAS at 7 TeV. Event counts in electron and muon signal regions are implemented as one-bin histograms. - Histograms for missing transverse energy and effective mass are implemented for the two + Histograms for missing transverse energy and effective mass are implemented for the two signal regions.' Modified: branches/2011-07-aida2yoda/data/anainfo/ATLAS_2011_CONF_2011_098.info ============================================================================== --- branches/2011-07-aida2yoda/data/anainfo/ATLAS_2011_CONF_2011_098.info Fri Mar 16 15:39:17 2012 (r3615) +++ branches/2011-07-aida2yoda/data/anainfo/ATLAS_2011_CONF_2011_098.info Fri Mar 16 15:41:03 2012 (r3616) @@ -1,9 +1,9 @@ Name: ATLAS_2011_CONF_2011_098 Year: 2011 -Summary: B-jets Search for Supersymmetry with 0-leptons +Summary: B-jets search for supersymmetry with 0-leptons Experiment: ATLAS Collider: LHC -SpiresID: +SpiresID: Status: UNVALIDATED Authors: - Angela Chen <aqchen at fas.harvard.edu> @@ -16,7 +16,7 @@ Energies: [7000] Description: 'Search for supersymmmetric particles by ATLAS at 7 TeV in events with b-jets, large missing - energy, and no leptons. + energy, and no leptons. Event counts in four signal regions (1 b-jet, m_eff>500*GeV; 1 b-jet, m_eff>700*GeV; 2 b-jets, m_eff>500*GeV; 2 b-jets, m_eff>700*GeV) are implemented as one-bin histograms. Histograms for missing transverse energy, effective mass, and pT of the leading jet are Modified: branches/2011-07-aida2yoda/data/anainfo/ATLAS_2011_S8971293.info ============================================================================== --- branches/2011-07-aida2yoda/data/anainfo/ATLAS_2011_S8971293.info Fri Mar 16 15:39:17 2012 (r3615) +++ branches/2011-07-aida2yoda/data/anainfo/ATLAS_2011_S8971293.info Fri Mar 16 15:41:03 2012 (r3616) @@ -1,6 +1,6 @@ Name: ATLAS_2011_S8971293 Year: 2011 -Summary: Dijet Azimuthal Decorrelations +Summary: Dijet azimuthal decorrelations Experiment: ATLAS Collider: LHC SpiresID: 8971293 Modified: branches/2011-07-aida2yoda/data/anainfo/ATLAS_2011_S8983313.info ============================================================================== --- branches/2011-07-aida2yoda/data/anainfo/ATLAS_2011_S8983313.info Fri Mar 16 15:39:17 2012 (r3615) +++ branches/2011-07-aida2yoda/data/anainfo/ATLAS_2011_S8983313.info Fri Mar 16 15:41:03 2012 (r3616) @@ -1,6 +1,6 @@ Name: ATLAS_2011_S8983313 Year: 2011 -Summary: 0-Lepton Squark and Gluino Search +Summary: 0-lepton squark and gluino search Experiment: ATLAS Collider: LHC SpiresID: 8983313 @@ -15,7 +15,7 @@ Beams: [p+, p+] Energies: [7000] Description: - '0-lepton search for squarks and gluinos by ATLAS at 7 TeV. + '0-lepton search for squarks and gluinos by ATLAS at 7 TeV. Event counts in four signal regions A-D are implemented as one-bin histograms.' BibKey: daCosta:2011qk Modified: branches/2011-07-aida2yoda/data/anainfo/ATLAS_2011_S9019561.info ============================================================================== --- branches/2011-07-aida2yoda/data/anainfo/ATLAS_2011_S9019561.info Fri Mar 16 15:39:17 2012 (r3615) +++ branches/2011-07-aida2yoda/data/anainfo/ATLAS_2011_S9019561.info Fri Mar 16 15:41:03 2012 (r3616) @@ -1,6 +1,6 @@ Name: ATLAS_2011_S9019561 Year: 2011 -Summary: Two Lepton Supersymmetry Search +Summary: Two lepton supersymmetry search Experiment: ATLAS Collider: LHC SpiresID: 9019561 @@ -15,7 +15,7 @@ Beams: [p+, p+] Energies: [7000] Description: - '2-lepton search for supersymmetric particles by ATLAS at 7 TeV. + '2-lepton search for supersymmetric particles by ATLAS at 7 TeV. Event counts in signal regions (3 same sign and 3 opposite sign) are implemented as one bin histograms. Histograms for missing transverse energy are implemented.' BibKey: Aad:2011xm Modified: branches/2011-07-aida2yoda/data/anainfo/ATLAS_2011_S9212183.info ============================================================================== --- branches/2011-07-aida2yoda/data/anainfo/ATLAS_2011_S9212183.info Fri Mar 16 15:39:17 2012 (r3615) +++ branches/2011-07-aida2yoda/data/anainfo/ATLAS_2011_S9212183.info Fri Mar 16 15:41:03 2012 (r3616) @@ -1,6 +1,6 @@ Name: ATLAS_2011_S9212183 Year: 2011 -Summary: 0-Lepton Squark and Gluino Search +Summary: 0-lepton squark and gluino search Experiment: ATLAS Collider: LHC SpiresID: 9212183 @@ -16,7 +16,7 @@ Beams: [p+, p+] Energies: [7000] Description: - '0-lepton search for squarks and gluinos by ATLAS at 7 TeV. + '0-lepton search for squarks and gluinos by ATLAS at 7 TeV. Event counts in five signal regions are implemented as one-bin histograms.' BibKey: Aad:2011ib Modified: branches/2011-07-aida2yoda/data/anainfo/ATLAS_2011_S9225137.info ============================================================================== --- branches/2011-07-aida2yoda/data/anainfo/ATLAS_2011_S9225137.info Fri Mar 16 15:39:17 2012 (r3615) +++ branches/2011-07-aida2yoda/data/anainfo/ATLAS_2011_S9225137.info Fri Mar 16 15:41:03 2012 (r3616) @@ -1,6 +1,6 @@ Name: ATLAS_2011_S9225137 Year: 2011 -Summary: High jet multiplicity Squark and Gluino Search +Summary: High jet multiplicity squark and gluino search Experiment: ATLAS Collider: LHC SpiresID: 9225137 Modified: branches/2011-07-aida2yoda/include/Rivet/Math/MathUtils.hh ============================================================================== --- branches/2011-07-aida2yoda/include/Rivet/Math/MathUtils.hh Fri Mar 16 15:39:17 2012 (r3615) +++ branches/2011-07-aida2yoda/include/Rivet/Math/MathUtils.hh Fri Mar 16 15:41:03 2012 (r3616) @@ -287,9 +287,9 @@ inline double covariance(const vector<int>& sample1, const vector<int>& sample2) { const double mean1 = mean(sample1); const double mean2 = mean(sample2); - const int N = sample1.size(); + const size_t N = sample1.size(); double cov = 0.0; - for (int i = 0; i < N; i++) { + for (size_t i = 0; i < N; i++) { const double cov_i = (sample1[i] - mean1)*(sample2[i] - mean2); cov += cov_i; } @@ -303,9 +303,9 @@ const double mean2 = mean(sample2); const double mean1_e = mean_err(sample1); const double mean2_e = mean_err(sample2); - const int N = sample1.size(); + const size_t N = sample1.size(); double cov_e = 0.0; - for (int i = 0; i < N; i++) { + for (size_t i = 0; i < N; i++) { const double cov_i = (sqrt(sample1[i]) - mean1_e)*(sample2[i] - mean2) + (sample1[i] - mean1)*(sqrt(sample2[i]) - mean2_e); cov_e += cov_i; Modified: branches/2011-07-aida2yoda/src/Analyses/ALEPH_1999_S4193598.cc ============================================================================== --- branches/2011-07-aida2yoda/src/Analyses/ALEPH_1999_S4193598.cc Fri Mar 16 15:39:17 2012 (r3615) +++ branches/2011-07-aida2yoda/src/Analyses/ALEPH_1999_S4193598.cc Fri Mar 16 15:41:03 2012 (r3616) @@ -8,6 +8,7 @@ #include "Rivet/Projections/ChargedFinalState.hh" #include "Rivet/Projections/UnstableFinalState.hh" + bool hasDecayedTo(const HepMC::GenParticle* p, int id1, int id2) { bool decision = false; HepMC::GenVertex* decV = p->end_vertex(); @@ -27,6 +28,7 @@ return hasDecayedTo(p.genParticle(), id1, id2); } + namespace Rivet { @@ -50,14 +52,11 @@ /// Book histograms and initialise projections before the run void init() { - addProjection(Beam(), "Beams"); addProjection(UnstableFinalState(), "UFS"); addProjection(ChargedFinalState(), "CFS"); _h_Xe_Ds = bookHisto1D(1, 1, 1); - - } @@ -68,7 +67,7 @@ // Trigger condition const ChargedFinalState& cfs = applyProjection<ChargedFinalState>(event, "CFS"); if (cfs.size() < 5) vetoEvent; - + _sumWpassed += weight; const UnstableFinalState& ufs = applyProjection<UnstableFinalState>(event, "UFS"); @@ -77,17 +76,15 @@ const ParticlePair& beams = applyProjection<Beam>(event, "Beams").beams(); const double meanBeamMom = ( beams.first.momentum().vector3().mod() + beams.second.momentum().vector3().mod() ) / 2.0/GeV; - - foreach (const Particle& p, ufs.particles()) { - - const PdgId pid = fabs(p.pdgId()); + foreach (const Particle& p, ufs.particles()) { + const PdgId pid = abs(p.pdgId()); switch (pid) { case 413: // Accept all D*+- decays. Normalisation to D0 + pi+- in finalize() - + // Scaled energy. const double energy = p.momentum().E()/GeV; const double scaledEnergy = energy/meanBeamMom;
More information about the Rivet-svn mailing list |