Changeset 490 in Sophya for trunk/SophyaLib/NTools/generaldata.h

Timestamp:

Oct 21, 1999, 5:25:53 PM (26 years ago)

Author:

ansari

Message:

Merge avec PEIDA++ (~V 3.8) et nettoyage pour nouveau PPersist Reza+cmv 21/10/99

File:

• trunk/SophyaLib/NTools/generaldata.h (modified) (6 diffs)

trunk/SophyaLib/NTools/generaldata.h

@@ -4 +4 @@
 #define GENERALDATA_SEEN
 
+#include "objfio.h"
+#include <iostream.h>
 #include "pexceptions.h"
 #include "ppersist.h"
+#include "ntupintf.h"
 #include "poly.h"
-#include "anydataobj.h"
 
 namespace PlanckDPC {
 
 class GeneralFit;
-class FIO_GeneralFitData;
 
 //================================================================
@@ -18 +19 @@
 //================================================================
 
-class GeneralFitData : public AnyDataObj {
+class GeneralFitData : public AnyDataObj , public NTupleInterface {
   friend class GeneralFit;
-  friend class FIO_GeneralFitData;
+  friend class ObjFileIO<GeneralFitData>;
 public:
   enum {Def_ErrF = 1, Def_ErrX = 0};
@@ -63 +64 @@
   void PrintData(int i1,int i2);
   void PrintData();
+  void Show(ostream& os) const;
+  inline void Show() const {Show(cout);}
 
   inline int GetSpaceFree() const { return mNDataAlloc - mNData; }
@@ -103 +106 @@
                 {if(i>=0 && i<mNData) return mErr[i]; else return 0.;}
 
-  r_8* GetVec(int n, r_8* ret=NULL)  const ;
-  r_4* GetVecR4(int n, r_4* ret=NULL)  const ;
-  int GetMinMax(int var,int& imin,int& imax);
-  int GetMinMax(int var,double& min,double& max);
+  r_8* GetVec(int n, r_8* ret=NULL)  const;
+  r_4* GetVecR4(int n, r_4* ret=NULL)  const;
+  int GetMnMx(int var,int& imin,int& imax) const;
+  int GetMnMx(int var,double& min,double& max) const;
   int GetMeanSigma(int var,double& mean,double& sigma,double min=1.,double max=-1.);
   int GetMoMeMed(int var,double& mode,double& mean,double& median,
@@ -115 +118 @@
   GeneralFitData FitResidus(GeneralFit& gfit);
   GeneralFitData FitFunction(GeneralFit& gfit);
-  string VarList_C(const char* nomx)  const;
+
+// Declaration de l interface NTuple
+  virtual uint_4        NbLines() const;
+  virtual uint_4        NbColumns() const;
+  virtual r_8 *         GetLineD(int n) const;
+  virtual r_8           GetCell(int n, int k) const;
+  virtual r_8           GetCell(int n, string const & nom) const;
+  virtual void          GetMinMax(int k, double& min, double& max) const; 
+  virtual void          GetMinMax(string const & nom, double& min, double& max) const;
+  virtual int           ColumnIndex(string const & nom) const;
+  virtual string        ColumnName(int k) const;
+  virtual string        VarList_C(const char* nomx=NULL) const;
 
 protected:
@@ -134 +148 @@
 };
 
+inline ostream& operator << (ostream& s, GeneralFitData const & g)
+                         {g.Show(s); return(s);}
+
 /////////////////////////////////////////////////////////////////////////
 // Classe pour la gestion de persistance
-class FIO_GeneralFitData : public  PPersist  {
-public:
-  FIO_GeneralFitData();
-  FIO_GeneralFitData(string const & filename); 
-  FIO_GeneralFitData(const GeneralFitData & obj);
-  FIO_GeneralFitData(GeneralFitData * obj);
-  virtual ~FIO_GeneralFitData();
-  virtual AnyDataObj* DataObj();
-  inline operator GeneralFitData() { return(*dobj); }
-protected :
-  virtual void ReadSelf(PInPersist&);           
-  virtual void WriteSelf(POutPersist&) const;  
-  GeneralFitData * dobj;
-  bool ownobj;
-};
+
+inline POutPersist& operator << (POutPersist& os, GeneralFitData & obj)
+{ ObjFileIO<GeneralFitData> fio(&obj);  fio.Write(os);  return(os); }
+inline PInPersist& operator >> (PInPersist& is, GeneralFitData & obj)
+{ ObjFileIO<GeneralFitData> fio(&obj);  fio.Read(is);  return(is); }
+
+// Classe pour la gestion de persistance
+// ObjFileIO<GeneralFitData>
 
 } // Fin du namespace