Changeset 307 in Sophya for trunk/SophyaLib/NTools/histos2.h

Timestamp:

May 19, 1999, 5:58:06 PM (26 years ago)

Author:

ansari

Message:

FIO_... + grosses modifs cmv 19/5/99

File:

• trunk/SophyaLib/NTools/histos2.h (modified) (5 diffs)

trunk/SophyaLib/NTools/histos2.h

@@ -15 +15 @@
 
 #include "peida.h"
+#include "utils.h"
 #include "histos.h"
-#include "utils.h"
-#include "ppersist.h"
-
+
+namespace PlanckDPC {
 
 class GeneralFit;
 
-
-class Histo2D : public PPersist {
-
+class Histo2D : public AnyDataObj {
+  friend class FIO_Histo2D;
 public:
-  enum {classId = ClassId_Histo2D };
 
   // CREATOR / DESTRUCTOR
@@ -33 +31 @@
   Histo2D(const Histo2D& h);
   Histo2D();
-  Histo2D(char *flnm);
-
   virtual  ~Histo2D();
 
@@ -125 +121 @@
   // Fit
   int      Fit(GeneralFit& gfit,unsigned short typ_err=0);
-  Histo2D* FitResidus(GeneralFit& gfit);
-  Histo2D* FitFunction(GeneralFit& gfit);
+  Histo2D  FitResidus(GeneralFit& gfit);
+  Histo2D  FitFunction(GeneralFit& gfit);
 
   // Print et Display ASCII
@@ -175 +171 @@
   void           ShowSli(int lp = 0);
 
-  int_4             ClassId() const        { return classId; }
-  static PPersist*  Create()               { return new Histo2D;}
-
-  virtual void      WriteSelf(POutPersist&) const;
-  virtual void      ReadSelf(PInPersist&);
-
 #ifndef __DECCXX
 protected:
@@ -224 +214 @@
 };
 
+/////////////////////////////////////////////////////////////////////////
+// Classe pour la gestion de persistance
+class FIO_Histo2D : public  PPersist  {
+public:
+  FIO_Histo2D();
+  FIO_Histo2D(string const & filename); 
+  FIO_Histo2D(const Histo2D & obj);
+  FIO_Histo2D(Histo2D * obj);
+  virtual ~FIO_Histo2D();
+  virtual AnyDataObj* DataObj();
+  inline operator Histo2D() { return(*dobj); }
+protected :
+  virtual void ReadSelf(PInPersist&);           
+  virtual void WriteSelf(POutPersist&) const;  
+  Histo2D * dobj;
+  bool ownobj;
+};
+
+} // Fin du namespace
+
 #endif // HISTOS2_SEEN