Changeset 3123 in Sophya for trunk/SophyaExt/FitsIOServer/fitshistos.cc

Timestamp:

Jan 10, 2007, 12:53:57 PM (19 years ago)

Author:

cmv

Message:

modif HistoErr Histo2DErr cmv 10/01/07

File:

• trunk/SophyaExt/FitsIOServer/fitshistos.cc (modified) (11 diffs)

trunk/SophyaExt/FitsIOServer/fitshistos.cc

@@ -9 +9 @@
 #include "histos.h"
 #include "hisprof.h"
-#include "histerr.h"
 #include "histos2.h"
 
@@ -16 +15 @@
 
 
-///////////////////////////////////////////////////////////////////////////
-///////////////////////// Histo , HProf , HistoErr ////////////////////////
-///////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////
+///////////////////////// Histo , HProf ////////////////////////
+////////////////////////////////////////////////////////////////
 
 DECL_TEMP_SPEC  /* equivalent a template <> , pour SGI-CC en particulier */
@@ -27 +26 @@
   string clsnm = is.KeyValue(key);
   if ( (clsnm == "SOPHYA::Histo")
-     || (clsnm == "SOPHYA::HProf")
-     || (clsnm == "SOPHYA::HistoErr") ) return 2;
+     || (clsnm == "SOPHYA::HProf") ) return 2;
   return 0;
 }
@@ -50 +48 @@
   Histo*    h  = dynamic_cast< Histo *> (dobj);
   HProf*    hp = dynamic_cast< HProf *> (dobj);
-  HistoErr* he = dynamic_cast< HistoErr *> (dobj);
 
   //--- Les noms de colonnes
@@ -66 +63 @@
   }
   // Le nombre d'entrees dans le bin
-  if(he!=NULL || hp!=NULL) {
+  if(hp!=NULL) {
     if(tbltyp==ASCII_TBL) tform.push_back("D15.8"); else tform.push_back("D");
     colnames.push_back("nb");
@@ -83 +80 @@
     if(h->mErr2) FitsBlockRW<r_8>::WriteColumnData(os,2,1,1,h->mErr2,n);
     if(hp!=NULL) FitsBlockRW<r_8>::WriteColumnData(os,3,1,1,hp->mSumW,n);
-    if(he!=NULL) FitsBlockRW<r_8>::WriteColumnData(os,3,1,1,he->mNData,n);
   }
 
@@ -91 +87 @@
   mtv = "SOPHYA::Histo";
   if(hp) mtv = "SOPHYA::HProf";
-  else if(he) mtv = "SOPHYA::HistoErr";
   os.WriteKey("SOPCLSNM",mtv," SOPHYA class name");
 
   mtv = "Histo";
   if(hp) mtv = "HProf";
-  else if(he) mtv = "HistoErr";
   os.WriteKey("CONTENT",mtv," name of SOPHYA object");
 
@@ -142 +136 @@
   }
   
-  if(he) {
-    mtv = he->mCorrel;
-    os.WriteKey("NCORREL",mtv," number of Correl calls");
-  }
-
   return;
 }
@@ -185 +174 @@
     if(clsnm == "SOPHYA::Histo") dobj = new Histo;
     else if(clsnm == "SOPHYA::HProf") dobj = new HProf;
-    else if(clsnm == "SOPHYA::HistoErr") dobj = new HistoErr;
   }
 
@@ -191 +179 @@
   Histo*    h  = dynamic_cast< Histo *> (dobj);
   HProf*    hp = dynamic_cast< HProf *> (dobj);
-  HistoErr* he = dynamic_cast< HistoErr *> (dobj);
 
   //--- Allocation pour histo
-  if(he && (clsnm=="SOPHYA::HistoErr")) {
-    if(ncol<3)
-      throw FitsIOException("FitsHandler<Histo>::Read() wrong number of columns for HistoErr");
-    he->CreateOrResize(xmin,xmax,nbin);
-  } else if(hp&& (clsnm=="SOPHYA::HProf")) {
+  if(hp&& (clsnm=="SOPHYA::HProf")) {
     if(ncol<3)
       throw FitsIOException("FitsHandler<Histo>::Read() wrong number of columns for HProf");
@@ -225 +208 @@
   }
 
-  if(he) he->mCorrel = dvl.GetI("NCORREL",0);
-
   //--- remplissage de l'histo
   FitsBlockRW<r_8>::ReadColumnData(is,1,1,1,h->mData,nbin);
   if(h->mErr2) FitsBlockRW<r_8>::ReadColumnData(is,2,1,1,h->mErr2,nbin);
   if(hp) FitsBlockRW<r_8>::ReadColumnData(is,3,1,1,hp->mSumW,nbin);
-  if(he) FitsBlockRW<r_8>::ReadColumnData(is,3,1,1,he->mNData,nbin);
 
   return;