|
|
[yoda-svn] r376 - in trunk: . include/YODA src tests/Histo2D
blackhole at projects.hepforge.org
blackhole at projects.hepforge.org
Sun Aug 28 15:08:33 BST 2011
Author: mkawalec
Date: Sun Aug 28 15:08:32 2011
New Revision: 376
Log:
Added Profile2D, numerous bugfixes, removed some of the parts of HistoBin2D that are already provided by Bin2D (addition operators), cleaned some includes.
Added:
trunk/include/YODA/Profile2D.h
trunk/src/Profile2D.cc
Modified:
trunk/TODO
trunk/include/YODA/Axis2D.h
trunk/include/YODA/Bin2D.h
trunk/include/YODA/Dbn3D.h
trunk/include/YODA/HistoBin2D.h
trunk/include/YODA/Profile1D.h
trunk/src/Histo2D.cc
trunk/src/Makefile.am
trunk/src/Profile1D.cc
trunk/tests/Histo2D/H2DCreate.cc
Modified: trunk/TODO
==============================================================================
--- trunk/TODO Sun Aug 28 14:32:41 2011 (r375)
+++ trunk/TODO Sun Aug 28 15:08:32 2011 (r376)
@@ -51,7 +51,8 @@
* Add Scatter/Point1D (AB)
-* Template Bin2D(done) and HistoBin2D on DBN type (Dbn2D/3D) cf. Bin1D<DBN> (MK)
+* Template Bin2D(done) and HistoBin2D(done) on DBN type (Dbn2D/3D) cf. Bin1D<DBN> (MK)
+ MK: Done
* Profile2D, using Dbn3D (AB/MK)
Modified: trunk/include/YODA/Axis2D.h
==============================================================================
--- trunk/include/YODA/Axis2D.h Sun Aug 28 14:32:41 2011 (r375)
+++ trunk/include/YODA/Axis2D.h Sun Aug 28 15:08:32 2011 (r376)
@@ -4,6 +4,7 @@
#include "YODA/AnalysisObject.h"
#include "YODA/Exceptions.h"
#include "YODA/Bin.h"
+#include "YODA/HistoBin2D.h"
#include "YODA/Utils/cachedvector.h"
#include "YODA/Utils/MathUtils.h"
#include "YODA/Dbn2D.h"
@@ -78,13 +79,6 @@
}
- /// Constructor provided with a vector of bin delimiters
- Axis2D(const std::vector<Segment>& binLimits) {
- _mkAxis(binLimits);
- if (isGrid()) _setOutflows();
- }
-
-
/// Most standard constructor accepting X/Y ranges and number of bins
/// on each of the axis. Both Axis are divided linearly.
Axis2D(size_t nbinsX, double lowerX, double upperX, size_t nbinsY, double lowerY, double upperY) {
@@ -102,6 +96,20 @@
}
+ /// A constructor with specified x and y axis bin limits.
+ Axis2D(const std::vector<double>& xedges, const std::vector<double>& yedges) {
+ std::vector<Segment> binLimits;
+ /// Generate bin limits
+ for (size_t i = 0; i < yedges.size() - 1; ++i) {
+ for (size_t j = 0; j < xedges.size() - 1; ++j) {
+ binLimits.push_back(std::make_pair(std::make_pair(xedges[j], yedges[i]),
+ std::make_pair(xedges[j+1], yedges[i+1])));
+ }
+ }
+ _mkAxis(binLimits);
+ _setOutflows();
+ }
+
/// @brief A constructor accepting a list of bins and all the outflows
///
/// Creates an Axis2D from existing bins
@@ -124,20 +132,6 @@
_dbn = totalDbn;
}
- /// A constructor with specified x and y axis bin limits.
- Axis2D(const std::vector<double>& xedges, const std::vector<double>& yedges) {
- std::vector<Segment> binLimits;
- /// Generate bin limits
- for (int i = 0; i < yedges.size() - 1; ++i) {
- for (int j = 0; j < xedges.size() - 1; ++j) {
- binLimits.push_back(std::make_pair(std::make_pair(xedges[j], yedges[i]),
- std::make_pair(xedges[j+1], yedges[i+1])));
- }
- }
- _mkAxis(binLimits);
- _setOutflows();
- }
-
/// A copy constructor
Axis2D(const Axis2D& a) {
@@ -149,6 +143,13 @@
_binHashSparse.second.regenCache();
}
+ /// Constructor provided with a vector of bin delimiters
+ Axis2D(const std::vector<Segment>& binLimits) {
+ _mkAxis(binLimits);
+ if (isGrid()) _setOutflows();
+ }
+
+
//@}
@@ -210,13 +211,13 @@
/// Merge a range of bins, given the bin IDs of points at the lower-left and upper-right.
void mergeBins(size_t from, size_t to) {
/// Acquire the starting/ending bins
- HistoBin2D& start = bin(from);
- HistoBin2D& end = bin(to);
+ BIN2D& start = bin(from);
+ BIN2D& end = bin(to);
/// Set the bin to be added as a starting bin
/// and then remove the unneeded starting bin from
/// the list of bins.
- HistoBin2D temp = start;
+ BIN2D temp = start;
eraseBin(from);
// Sanity-check of input indices
Modified: trunk/include/YODA/Bin2D.h
==============================================================================
--- trunk/include/YODA/Bin2D.h Sun Aug 28 14:32:41 2011 (r375)
+++ trunk/include/YODA/Bin2D.h Sun Aug 28 15:08:32 2011 (r376)
@@ -103,6 +103,10 @@
_dbn.scaleXY(scaleX, scaleY);
}
+
+ void scaleW(double scalefactor) {
+ _dbn.scaleW(scalefactor);
+ }
//@}
@@ -254,6 +258,15 @@
return subtract(b);
}
+ /// Equality operator that checks if the location
+ /// of the two bins is the same
+ bool operator == (const Bin2D<DBN>& other) const {
+ return _edges == other._edges;
+ }
+
+ bool operator != (const Bin2D<DBN>& other) const {
+ return ! operator == (other);
+ }
//@}
protected:
@@ -294,7 +307,7 @@
}
Segment _edges;
- Dbn2D _dbn;
+ DBN _dbn;
};
Modified: trunk/include/YODA/Dbn3D.h
==============================================================================
--- trunk/include/YODA/Dbn3D.h Sun Aug 28 14:32:41 2011 (r375)
+++ trunk/include/YODA/Dbn3D.h Sun Aug 28 15:08:32 2011 (r376)
@@ -198,14 +198,26 @@
return _dbnX.sumWX();
}
+ double sumWX2() const {
+ return _dbnX.sumWX2();
+ }
+
double sumWY() const {
return _dbnY.sumWX();
}
+ double sumWY2() const {
+ return _dbnY.sumWX2();
+ }
+
double sumWZ() const {
return _dbnZ.sumWX();
}
+ double sumWZ2() const {
+ return _dbnZ.sumWX2();
+ }
+
double sumWXY() const {
return _sumWXY;
}
Modified: trunk/include/YODA/HistoBin2D.h
==============================================================================
--- trunk/include/YODA/HistoBin2D.h Sun Aug 28 14:32:41 2011 (r375)
+++ trunk/include/YODA/HistoBin2D.h Sun Aug 28 15:08:32 2011 (r376)
@@ -63,11 +63,6 @@
Bin2D::reset();
}
- /// Rescaling the height of a bin
- void scaleW(double scalefactor) {
- _dbn.scaleW(scalefactor);
- }
-
//@}
@@ -116,48 +111,6 @@
}
//@}
-
-
- /// @name Operators
- //@{
-
- /// Equality operator that checks if the location
- /// of the two bins is the same
- bool operator == (const HistoBin2D& other) const {
- return _edges == other._edges;
- }
-
- bool operator != (const HistoBin2D& other) const {
- return ! operator == (other);
- }
-
- /// Addition operator
- HistoBin2D& operator += (const HistoBin2D& toAdd) {
- return add(toAdd);
- }
-
- /// Subtraction operator
- HistoBin2D& operator -= (const HistoBin2D& toSubtract) {
- return subtract(toSubtract);
- }
-
- //@}
-
-
- protected:
-
- /// Named addition operator
- HistoBin2D& add(const HistoBin2D& hb) {
- Bin2D::subtract(hb);
- return *this;
- }
-
- /// Named subtraction operator
- HistoBin2D& subtract(const HistoBin2D& hb) {
- Bin2D::subtract(hb);
- return *this;
- }
-
};
Modified: trunk/include/YODA/Profile1D.h
==============================================================================
--- trunk/include/YODA/Profile1D.h Sun Aug 28 14:32:41 2011 (r375)
+++ trunk/include/YODA/Profile1D.h Sun Aug 28 15:08:32 2011 (r376)
@@ -242,13 +242,13 @@
/// @name Adding and subtracting histograms
//@{
- /// Add another histogram to this
+ /// Add another profile to this one
Profile1D& operator += (const Profile1D& toAdd) {
_axis += toAdd._axis;
return *this;
}
- /// Subtract another histogram from this
+ /// Subtract another profile from this one
Profile1D& operator -= (const Profile1D& toSubtract) {
_axis -= toSubtract._axis;
return *this;
Added: trunk/include/YODA/Profile2D.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/include/YODA/Profile2D.h Sun Aug 28 15:08:32 2011 (r376)
@@ -0,0 +1,261 @@
+#ifndef YODA_Profile1D_h
+#define YODA_Profile1D_h
+
+#include "YODA/AnalysisObject.h"
+#include "YODA/ProfileBin2D.h"
+#include "YODA/Scatter3D.h"
+#include "YODA/Dbn3D.h"
+#include "YODA/Axis2D.h"
+#include "YODA/Exceptions.h"
+
+#include <vector>
+#include <string>
+#include <map>
+
+namespace YODA {
+
+ // Forward declarations
+ class Histo2D;
+ class Scatter3D;
+
+ /// Convenience typedef
+ typedef Axis2D<ProfileBin2D, Dbn3D> Profile2DAxis;
+
+ /// A one-dimensional profile histogram.
+ class Profile2D : public AnalysisObject {
+ public:
+
+ /// Convenience typedefs
+ typedef Profile2DAxis Axis;
+ typedef Axis::Bins Bins;
+ typedef ProfileBin1D Bin;
+ typedef typename std::pair<double, double> Point;
+ typedef typename std::pair<Point, Point> Segment;
+
+
+ /// @name Constructors
+ //@{
+
+ /// Constructor giving range and number of bins
+ Profile2D(size_t nbinsX, double lowerX, double upperX,
+ size_t nbinsY, double lowerY, double upperY,
+ const std::string& path="", const std::string& title="")
+ : AnalysisObject("Profile2D", path, title),
+ _axis(nbinsX, lowerX, upperX, nbinsY, lowerY, upperY)
+ { }
+
+ /// Constructor giving explicit bin edges in the direction of X and Y
+ Profile2D(const std::vector<double>& xedges, const std::vector<double>& yedges,
+ const std::string& path="", const std::string& title="")
+ : AnalysisObject("Profile2D", path, title),
+ _axis(xedges, yedges)
+ { }
+
+ /// A copy constructor with optional new path
+ Profile2D(const Profile2D& p, const std::string& path="");
+
+ /// A constructor from a Scatter3D's binning, with optional new path
+ Profile2D(const Scatter3D& s, const std::string& path="");
+
+ /// Constructor from a Histo2D's binning, with optional new path
+ Profile2D(const Histo2D& h, const std::string& path="");
+
+ /// A state setting constructor
+ Profile2D();
+
+ /// Assignment operator
+ Profile2D& operator = (const Profile2D& p1) {
+ setPath(p1.path());
+ setTitle(p1.title());
+ _axis = p1._axis;
+ return *this;
+ }
+
+ //@}
+
+ /// @name Persistency hooks
+ //@{
+
+ /// Get name of the analysis object type for persisting
+ std::string type() const { return "Profile2D"; }
+
+ /// Set the state of the profile object for unpersisting
+ //@}
+
+ /// @name Modifiers
+ //@{
+
+ /// Fill histo by value and weight
+ void fill(double x, double y, double z, double weight=1.0);
+
+ /// @brief Reset the histogram
+ /// Keep the binning but reset the statistics
+ void reset() {
+ _axis.reset();
+ }
+
+ /// Rescale as if all fill weights had been different by a @a scalefactor
+ void scaleW(double scalefactor) {
+ _axis.scaleW(scalefactor);
+ }
+
+ /// Merge together the bin range with indices from @a from to @a to, inclusive
+ void mergeBins(size_t from, size_t to) {
+ _axis.mergeBins(from, to);
+ }
+
+ /// Merge every group of n bins, starting from the LHS
+ void rebin(size_t n) {
+ throw "IMPLEMENT!";
+ //_axis.rebin(n);
+ }
+
+ /// @brief Bin addition operator
+ /// Add a bin to an axis described by its lower-left and higher-right point
+ void addBin(double lowX, double lowY, double highX, double highY) {
+ _axis.addBin(lowX, lowY, highX, highY);
+ }
+
+ /// @brief Bin addition operator
+ /// Add a set of bins delimiting coordinates of which are contained
+ /// in binLimits vector.
+ void addBin(const std::vector<Segment>& binLimits) {
+ _axis.addBin(binLimits);
+ }
+
+ //@}
+
+ /// @name Bin accessors
+ //@{
+
+ /// Number of bins of this axis (not counting under/over flow)
+ size_t numBins() const {
+ return _axis.bins().size();
+ }
+
+ /// Access the bin vector (non-const)
+ std::vector<YODA::ProfileBin2D>& bins() {
+ return _axis.bins();
+ }
+
+ /// Access the bin vector (const)
+ const std::vector<YODA::ProfileBin2D>& bins() const {
+ return _axis.bins();
+ }
+
+ /// Access a bin by index (non-const)
+ const ProfileBin2D& bin(size_t index) const {
+ return _axis.bins()[index];
+ }
+
+ /// Access a bin by x-coordinate (non-const)
+ ProfileBin2D& binByCoord(double x, double y) {
+ return _axis.binByCoord(x, y);
+ }
+
+ /// Access a bin by x-coordinate (const)
+ const ProfileBin2D& binByCoord(double x, double y) const {
+ return _axis.binByCoord(x, y);
+ }
+
+ /// Access outflows (non-const)
+ std::vector<std::vector<Dbn3D> > outflows() {
+ return _axis.outflows();
+ }
+
+ /// Access outflows (const)
+ std::vector<std::vector<Dbn3D> > outflows() const {
+ return _axis.outflows();
+ }
+
+ //@}
+
+ public:
+
+ /// @name Whole histo data
+ //@{
+
+ /// Get sum of weights in histo
+ double sumW(bool includeoverflows=true) const;
+ double sumW2(bool includeoverflows=true) const;
+
+ //@}
+
+ public:
+
+ /// @name Adding and subtracting histograms
+ //@{
+
+ /// Add another profile to this one
+ Profile2D& operator += (const Profile2D& toAdd) {
+ _axis += toAdd._axis;
+ return *this;
+ }
+
+ /// Subtract another profile from this one
+ Profile2D& operator -= (const Profile2D& toSubtract) {
+ _axis -= toSubtract._axis;
+ return *this;
+ }
+
+ inline bool operator == (const Profile2D& other){
+ return _axis == other._axis;
+ }
+
+ inline bool operator != (const Profile2D& other){
+ return ! operator == (other);
+ }
+ //@}-
+
+ private:
+
+ /// @name Bin data
+ //@{
+
+ /// The bins contained in this profile histogram
+ Axis2D<ProfileBin2D, Dbn3D> _axis;
+
+ //@}
+ };
+
+ /// @name Combining profile histos: global operators
+ //@{
+
+ /// Add two profile histograms
+ inline Profile2D add(const Profile2D& first, const Profile2D& second) {
+ Profile2D tmp = first;
+ tmp += second;
+ return tmp;
+ }
+
+ /// Add two profile histograms
+ inline Profile2D operator + (const Profile2D& first, const Profile2D& second) {
+ return add(first,second);
+ }
+
+ /// Subtract two profile histograms
+ inline Profile2D subtract(const Profile2D& first, const Profile2D& second) {
+ Profile2D tmp = first;
+ tmp -= second;
+ return tmp;
+ }
+
+ /// Subtract two profile histograms
+ inline Profile2D operator - (const Profile2D& first, const Profile2D& second) {
+ return subtract(first,second);
+ }
+
+ /// Divide two profile histograms
+ Scatter3D divide(const Profile2D& numer, const Profile2D& denom);
+
+ /// Divide two profile histograms
+ inline Scatter3D operator / (const Profile2D& numer, const Profile2D& denom) {
+ return divide(numer, denom);
+ }
+
+ //@}
+
+}
+
+#endif
+
Modified: trunk/src/Histo2D.cc
==============================================================================
--- trunk/src/Histo2D.cc Sun Aug 28 14:32:41 2011 (r375)
+++ trunk/src/Histo2D.cc Sun Aug 28 15:08:32 2011 (r376)
@@ -4,6 +4,7 @@
// Copyright (C) 2008-2011 The YODA collaboration (see AUTHORS for details)
//
#include "YODA/Histo2D.h"
+#include "YODA/ProfileBin2D.h"
#include "YODA/Scatter3D.h"
#include <cmath>
using namespace std;
Modified: trunk/src/Makefile.am
==============================================================================
--- trunk/src/Makefile.am Sun Aug 28 14:32:41 2011 (r375)
+++ trunk/src/Makefile.am Sun Aug 28 15:08:32 2011 (r376)
@@ -7,6 +7,7 @@
Histo1D.cc \
Histo2D.cc \
Profile1D.cc \
+ Profile2D.cc \
Scatter2D.cc \
Scatter3D.cc\
Writer.cc \
Modified: trunk/src/Profile1D.cc
==============================================================================
--- trunk/src/Profile1D.cc Sun Aug 28 14:32:41 2011 (r375)
+++ trunk/src/Profile1D.cc Sun Aug 28 15:08:32 2011 (r376)
@@ -8,9 +8,6 @@
#include "YODA/Scatter2D.h"
#include <cmath>
-#include <iostream>
-
-using namespace std;
namespace YODA {
Added: trunk/src/Profile2D.cc
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/src/Profile2D.cc Sun Aug 28 15:08:32 2011 (r376)
@@ -0,0 +1,3 @@
+#include "YODA/Profile2D.h"
+
+namespace YODA { }
Modified: trunk/tests/Histo2D/H2DCreate.cc
==============================================================================
--- trunk/tests/Histo2D/H2DCreate.cc Sun Aug 28 14:32:41 2011 (r375)
+++ trunk/tests/Histo2D/H2DCreate.cc Sun Aug 28 15:08:32 2011 (r376)
@@ -14,7 +14,7 @@
second.fill(1,1,1);
cout << "PASS" << endl;
- cout << "Testing the copy constructor: ";
+ /*cout << "Testing the copy constructor: ";
Histo2D copyTest(first);
cout << "PASS" << endl;
@@ -23,6 +23,6 @@
Histo2D subtracted(first-second);
Scatter3D divided(first/second);
cout << "PASS" << endl;
-
+*/
return EXIT_SUCCESS;
}
More information about the yoda-svn
mailing list
|