|
[Rivet-svn] rivet: 2 new changesetsRivet Mercurial rivet at projects.hepforge.orgTue Oct 25 14:30:01 BST 2016
details: https://rivet.hepforge.org/hg/rivet/rev/fd090f249592 branches: multiweight changeset: 5570:fd090f249592 user: David Grellscheid <david.grellscheid at durham.ac.uk> date: Tue Oct 25 12:47:08 2016 +0100 description: Removed unused file. details: https://rivet.hepforge.org/hg/rivet/rev/bf076a1d34db branches: multiweight changeset: 5571:bf076a1d34db user: David Grellscheid <david.grellscheid at durham.ac.uk> date: Tue Oct 25 14:24:15 2016 +0100 description: Add smearing functionality to pushToPersistent. RivetYODA.cc compiles, probably nothing else. diffs (truncated from 459 to 50 lines): --- a/include/Rivet/Histo1D.hh Thu Oct 06 15:40:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,106 +0,0 @@ -// -*- C++ -*- -#ifndef RIVET_Histo1D_HH -#define RIVET_Histo1D_HH - - -#include "YODA/AnalysisObject.h" -#include "YODA/Histo1D.h" - -namespace YODA { - typedef std::shared_ptr<YODA::Histo1D> Histo1DPtr; -} - -#include <HepMC/WeightContainer.h> - -namespace Rivet { - - typedef shared_ptr<YODA::AnalysisObject> AnalysisObjectPtr; - - class Histo1D : public YODA::AnalysisObject { - public: - - Histo1D(std::vector<std::string> _weightNames, const YODA::Scatter2D& refscatter, const string& path); - Histo1D(std::vector<std::string> _weightNames, const vector<double>& binedges, const string& path); - Histo1D(std::vector<std::string> _weightNames, size_t nbins, double lower, double upper, const string& path); - - void fill(double x, double weight) { - _active->fill(x,weight); - } - - const YODA::Histo1D & activeobj() const { assert(_active); return *_active; } - YODA::Histo1DPtr active() const { return _active; } - - double integral() { assert(false); return 0.0; } - - const vector<YODA::Histo1DPtr> & persistent() const { return _persistent; } - - size_t dim() const { return 1; } - - private: - // @todo - // is this the right thing to do? - friend class AnalysisHandler; - - // ?? automatically ?? - // void new_Active(YODA::Histo1D * newA) { - // _active = newA; - // }
More information about the Rivet-svn mailing list |