Changeset 3139 in Sophya

Timestamp:

Jan 17, 2007, 5:51:29 PM (19 years ago)

Author:

cmv

Message:

modifs mineures et intro POHe2DAdapter cmv 17/01/2007

Location:

trunk/SophyaPI/PIext

Files:

• nomherradapter.cc (modified) (2 diffs)
• nomherradapter.h (modified) (1 diff)
• nomhistadapter.cc (modified) (1 diff)
• nomhistadapter.h (modified) (1 diff)
• pihisto.cc (modified) (1 diff)
• pipodrw.cc (modified) (2 diffs)
• pipodrw.h (modified) (3 diffs)

trunk/SophyaPI/PIext/nomherradapter.cc

@@ -7 +7 @@
 
 #include "nomherradapter.h"
-#include "servnobjm.h"
-
 #include "pihisto.h"   /* Wrapper pour HistoErr */
 #include "sohiswrap.h"   /* Wrapper pour HistoErr */
 
+#include "pipodrw.h"
+
+#include "servnobjm.h"
 
 #include "objfitter.h"
@@ -246 +247 @@
   */
   return NULL;
+}
+
+/* --Methode-- */
+P2DArrayAdapter* NOMAdapter_Histo2DErr::Get2DArray(string & dopt)
+{
+return ( new POHe2DAdapter(mHerr, false) );
 }
 

trunk/SophyaPI/PIext/nomherradapter.h

@@ -81 +81 @@
   virtual void                  Print(ostream& os, int lev=0);
   virtual PIDrawer*             GetDrawer(string& dopt);
+  virtual P2DArrayAdapter*      Get2DArray(string& dopt);
   virtual NTupleInterface*      GetNTupleInterface(bool& adel);
 

trunk/SophyaPI/PIext/nomhistadapter.cc

@@ -12 +12 @@
 #include "pihisto2d.h"
 #include "pipodrw.h"
+
 #include "servnobjm.h"
 

trunk/SophyaPI/PIext/nomhistadapter.h

@@ -11 +11 @@
 #include "histos2.h"
 #include "hisprof.h"
-#include "histerr.h"
 #include "ntuple.h"
 #include "xntuple.h"

trunk/SophyaPI/PIext/pihisto.cc

@@ -303 +303 @@
 info += "      =e: draw bin error (if exist)\n";
 info += "      =n: draw number of entries in the bin (if exist)\n";
-info += "      default: draw scaled and offset value (default)";
+info += "      default: draw scaled and offset value (default)\n";
 info += "  sta,stat,stats:            activate   statistic display\n";
 info += "  nsta,nstat,nostat,nostats: deactivate statistic display\n";

trunk/SophyaPI/PIext/pipodrw.cc

@@ -57 +57 @@
 
 // ----------------------------------------------------------
-// Adaptateur d'Histo-2D Peida++ a P2DArrayAdapter
+// Adaptateur d'Histo-2D a P2DArrayAdapter
 // ----------------------------------------------------------
 
@@ -78 +78 @@
 {
 return((*mH2d)(ix, iy));
+}
+
+// ----------------------------------------------------------
+// Adaptateur d'Histo2DErr a P2DArrayAdapter
+// ----------------------------------------------------------
+
+/* --Methode-- */
+POHe2DAdapter::POHe2DAdapter(Histo2DErr* he2d, bool ad)
+        : P2DArrayAdapter(he2d->NBinX(), he2d->NBinY())
+{
+aDel = ad; mHe2d = he2d;
+DefineXYCoordinates(he2d->XMin(), he2d->YMin(), he2d->WBinX(), he2d->WBinY() );
+}
+
+/* --Methode-- */
+POHe2DAdapter::~POHe2DAdapter()
+{
+if (aDel)  delete mHe2d;
+}
+
+/* --Methode-- */
+double POHe2DAdapter::Value(int ix, int iy)
+{
+return((*mHe2d)(ix, iy));
 }
 

trunk/SophyaPI/PIext/pipodrw.h

@@ -11 +11 @@
 #include "parradapter.h"
 #include "histos2.h"
+#include "hist2err.h"
 
 #ifdef SANS_EVOLPLANCK
@@ -33 +34 @@
 
 
-// Adaptateur d'Histo-2D Peida++ a P2DArrayAdapter
+// Adaptateur d'Histo-2D a P2DArrayAdapter
 class POH2DAdapter :  public P2DArrayAdapter {
 public :
@@ -44 +45 @@
   bool aDel;
   Histo2D* mH2d;
+};
+
+// Adaptateur d'Histo2DErr a P2DArrayAdapter
+class POHe2DAdapter :  public P2DArrayAdapter {
+public :
+                  POHe2DAdapter(Histo2DErr* he2d, bool ad=false);
+  virtual         ~POHe2DAdapter();
+
+  virtual double  Value(int ix, int iy);   
+
+protected:
+  bool aDel;
+  Histo2DErr* mHe2d;
 };