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

Timestamp:

Aug 12, 2006, 7:30:20 PM (19 years ago)

Author:

cmv

Message:

Histo,HProf,HistoErr,Histo2D ecriture fits cmv 12/8/2006

File:

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

trunk/SophyaExt/FitsIOServer/fitshistos.cc

@@ -11 +11 @@
 #include "histerr.h"
 #include "histos2.h"
+
 #include "fitsblkrw.h"
 #include "fitshandler.h"
@@ -65 +66 @@
   }
   // Le nombre d'entrees dans le bin
-  if(he!=NULL) {
+  if(he!=NULL || hp!=NULL) {
     if(tbltyp==ASCII_TBL) tform.push_back("D15.8"); else tform.push_back("D");
     colnames.push_back("nb");
@@ -78 +79 @@
   int n = h->NBins();
   if(n>0) {
+    if(hp) hp->UpdateHisto();
     FitsBlockRW<r_8>::WriteColumnData(os,1,1,1,h->mData,n);
     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);
   }
@@ -128 +131 @@
     mtv = ok;
     os.WriteKey("UPDOK",mtv," update status flag");
+
+    mtv = (int_4)hp->Opt;
+    os.WriteKey("SIGOPT",mtv," sigma statistic flag");
 
     mtv = hp->YMin;
@@ -165 +171 @@
   //--- Lecture entete FITS
   string key = "SOPCLSNM"; string clsnm = is.KeyValue(key);
-  if(  (clsnm != "SOPHYA::Histo")
-    && (clsnm != "SOPHYA::HProf")
-    && (clsnm != "SOPHYA::HistoErr") )
-    throw FitsIOException("FitsHandler<Histo>::Read() bad value for key SOPCLSNM");
-
-  DVList dvl;
-  is.GetHeaderRecords(dvl,true,false);
+  DVList dvl; is.GetHeaderRecords(dvl,true,false);
 
   int_4 nbin = dvl.GetI("NBIN",-1);
@@ -180 +180 @@
   r_8 xmax = dvl.GetD("XMAX",+1.);
 
-  //--- Creation de l'objet
-  if (dobj != NULL) delete dobj;  // destruction si existe
-  if( clsnm == "SOPHYA::Histo" ) {
-    dobj = new Histo(xmin,xmax,nbin);
-    int_4 haserr2 = dvl.GetI("HASERR2",0);
-    if(ncol>1 && haserr2>0) dobj->Errors();
-  } else if( clsnm == "SOPHYA::HProf" ) {
-    if(ncol<2)
-      throw FitsIOException("FitsHandler<Histo>::Read() wrong number of columns for HProf");
-    r_8 ymin = dvl.GetD("YMIN",1.);
-    r_8 ymax = dvl.GetD("YMAX",-1.);
-    dobj = new HProf(xmin,xmax,nbin,ymin,ymax);
-  } else if( clsnm == "SOPHYA::HistoErr" ) {
-    if(ncol<3)
-      throw FitsIOException("FitsHandler<Histo>::Read() wrong number of columns for HistoErr");
-    dobj = new HistoErr(xmin,xmax,nbin);
-  } else {
-    throw FitsIOException("FitsHandler<Histo>::Read() Not a Histo or HProf or HistoErr");
+  //--- Creation de l'objet si necessaire
+  if(dobj == NULL) {
+    if(clsnm == "SOPHYA::Histo") dobj = new Histo;
+    else if(clsnm == "SOPHYA::HProf") dobj = new HProf;
+    else if(clsnm == "SOPHYA::HistoErr") dobj = new HistoErr;
   }
 
@@ -204 +191 @@
   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(ncol<3)
+      throw FitsIOException("FitsHandler<Histo>::Read() wrong number of columns for HProf");
+    r_8 ymin = dvl.GetD("YMIN",1.);
+    r_8 ymax = dvl.GetD("YMAX",-1.);
+    hp->CreateOrResize(xmin,xmax,nbin,ymin,ymax);
+  } else if(h && clsnm == "SOPHYA::Histo" ) {
+    h->CreateOrResize(xmin,xmax,nbin);
+    int_4 haserr2 = dvl.GetI("HASERR2",0);
+    if(ncol>1 && haserr2>0) h->Errors();
+  } else {
+    throw FitsIOException("FitsHandler<Histo>::Read() No assocaition classe/fits_header");
+  }
 
   //--- remplissage des variables d'entete
@@ -213 +219 @@
   if(hp) {
     int_4 ok = dvl.GetI("UPDOK",0); hp->Ok = (ok)? true : false;
+    hp->Opt = (uint_2)dvl.GetI("SIGOPT",0);
     hp->YMin = dvl.GetD("YMIN",1.);
     hp->YMax = dvl.GetD("YMAX",-1.);
@@ -222 +229 @@
   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);
 
@@ -234 +242 @@
 int FitsHandler<Histo2D>::CheckReadability(FitsInOutFile& is)
 {
-  if (is.CurrentHDUType() != IMAGE_HDU ) return 0;
+  if (is.CurrentHDUType() == IMAGE_HDU ) return 0;
   string key = "SOPCLSNM"; 
   string clsnm = is.KeyValue(key);
-  if( clsnm == "SOPHYA::Histo2D" ) return 2;
+  if( clsnm == "SOPHYA::Histo2D") return 2;
   return 0;
 }
@@ -340 +348 @@
 
   //--- Nb de lignes et de colonnes 
-  vector<string> colnames;
-  vector<int> coltypes;
-  vector<long> repcnt, width;
+  vector<string> colnames; vector<int> coltypes; vector<long> repcnt, width;
   is.GetColInfo(colnames,coltypes,repcnt,width);
   long ncol = colnames.size();
@@ -352 +358 @@
 
   //--- Lecture entete FITS
-  string key = "SOPCLSNM"; string clsnm = is.KeyValue(key);
-  if( clsnm != "SOPHYA::Histo2D" )
-    throw FitsIOException("FitsHandler<Histo2D>::Read() bad value for key SOPCLSNM");
-
-  DVList dvl;
-  is.GetHeaderRecords(dvl,true,false);
+  DVList dvl; is.GetHeaderRecords(dvl,true,false);
 
   int_4 nbinx = dvl.GetI("NBINX",-1);
@@ -371 +372 @@
 
   //--- Creation de l'objet
-  if (dobj != NULL) delete dobj;  // destruction si existe
-  if( clsnm == "SOPHYA::Histo2D" ) {
-    dobj = new Histo2D(xmin,xmax,nbinx,ymin,ymax,nbiny);
-    int_4 haserr2 = dvl.GetI("HASERR2",0);
-    if(ncol>1 && haserr2>0) dobj->Errors();
-  } else {
-    throw FitsIOException("FitsHandler<Histo2D>::Read() Not a Histo2D");
-  }
-
-  //--- Type de l'histo
-  Histo2D* h  = dynamic_cast< Histo2D *> (dobj);
+  if(dobj == NULL) dobj = new Histo2D;
+  dobj->CreateOrResize(xmin,xmax,nbinx,ymin,ymax,nbiny);
+  int_4 haserr2 = dvl.GetI("HASERR2",0);
+  if(ncol>1 && haserr2>0) dobj->Errors();
 
   //--- remplissage des variables d'entete
-  h->nHist = dvl.GetD("NHIST",0.);
-  h->nEntries = dvl.GetI("NENTRIES",0);
+  dobj->nHist = dvl.GetD("NHIST",0.);
+  dobj->nEntries = dvl.GetI("NENTRIES",0);
 
   for(int i=0;i<3;i++) for(int j=0;j<3;j++) {
     char str[16]; sprintf(str,"OUT%1d%1d",i,j);
-    h->mOver[i][j] = dvl.GetD(str,0.);
+    dobj->mOver[i][j] = dvl.GetD(str,0.);
   }
 
   //--- remplissage de l'histo
-  FitsBlockRW<r_8>::ReadColumnData(is,1,1,1,h->mData,nbinxy);
-  if(h->mErr2) FitsBlockRW<r_8>::ReadColumnData(is,2,1,1,h->mErr2,nbinxy);
-
-}
+  FitsBlockRW<r_8>::ReadColumnData(is,1,1,1,dobj->mData,nbinxy);
+  if(dobj->mErr2) FitsBlockRW<r_8>::ReadColumnData(is,2,1,1,dobj->mErr2,nbinxy);
+
+}