Changeset 307 in Sophya for trunk/SophyaLib/NTools/histos.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/histos.h (modified) (5 diffs)

trunk/SophyaLib/NTools/histos.h

@@ -1 +1 @@
 // This may look like C code, but it is really -*- C++ -*-
 //
-// $Id: histos.h,v 1.1.1.1 1999-04-09 17:57:56 ansari Exp $
+// $Id: histos.h,v 1.2 1999-05-19 15:58:00 ansari Exp $
 //
 
@@ -11 +11 @@
 #include "cvector.h"
 #include "ppersist.h"
+#include "anydataobj.h"
+
+namespace PlanckDPC {
 
 class GeneralFit;
 
-class Histo : public PPersist {
-
+class Histo : public AnyDataObj {
+  friend class FIO_Histo;
 public:
-  enum {classId = ClassId_Histo1D };
 
   // CREATOR / DESTRUCTOR
   Histo();
   Histo(float xMin, float xMax, int nBin=100);
-  Histo(char *flnm);
   Histo(const Histo& H);
   virtual        ~Histo();
@@ -131 +132 @@
   // Fit
   int    Fit(GeneralFit& gfit,unsigned short typ_err=0);
-  Histo* FitResidus(GeneralFit& gfit);
-  Histo* FitFunction(GeneralFit& gfit);
+  Histo  FitResidus(GeneralFit& gfit);
+  Histo  FitFunction(GeneralFit& gfit);
 
   // Print et Display ASCII
@@ -139 +140 @@
   void           Print(int dyn = 100, float hmin = 1., float hmax = -1.,
                         int pflag = 0, int il = 1, int ih = -1);
-
-  // PPersist objet
-  int_4             ClassId() const        { return classId; }
-  static PPersist*  Create()               { return new Histo;}
-
-  virtual void      WriteSelf(POutPersist&) const;
-  virtual void      ReadSelf(PInPersist&);
-
 
 protected:
@@ -163 +156 @@
 };
 
+/////////////////////////////////////////////////////////////////////////
+// Classe pour la gestion de persistance
+class FIO_Histo : public  PPersist  {
+public:
+  FIO_Histo();
+  FIO_Histo(string const & filename); 
+  FIO_Histo(const Histo & obj);
+  FIO_Histo(Histo * obj);
+  virtual ~FIO_Histo();
+  virtual AnyDataObj* DataObj();
+  inline operator Histo() { return(*dobj); }
+protected :
+  virtual void ReadSelf(PInPersist&);           
+  virtual void WriteSelf(POutPersist&) const;  
+  Histo * dobj;
+  bool ownobj;
+};
+
+} // Fin du namespace
+
 #endif // HISTOS_SEEN