Changeset 1047 in Sophya for trunk/SophyaExt/FitsIOServer/fitsntuple.cc

Timestamp:

Jun 15, 2000, 12:22:23 PM (25 years ago)

Author:

ansari

Message:

modifs pour introduction lecteur de fits par lignes

File:

• trunk/SophyaExt/FitsIOServer/fitsntuple.cc (modified) (9 diffs)

trunk/SophyaExt/FitsIOServer/fitsntuple.cc

@@ -15 +15 @@
 {
   dobj_ = new NTuple;
-  column_ = NULL;
-  ownobj=true;
+  InitNull();
+  ownobj_ = true;
 }
 
@@ -22 +22 @@
 {
   dobj_ = new NTuple;
-  column_ = NULL;
-  ownobj=true; 
+  InitNull();
+  ownobj_ = true; 
 
   ReadF(inputfile,hdunum);
@@ -32 +32 @@
 { 
   dobj_ = new NTuple(obj);
-  column_ = NULL;
-  ownobj=true; 
+  InitNull();
+  ownobj_ = true; 
+}
+FITS_NTuple::FITS_NTuple(NTuple* obj) 
+{ 
+  dobj_ = obj;
+  InitNull();
+  ownobj_ = false; 
 }
 
@@ -39 +45 @@
 FITS_NTuple::~FITS_NTuple()
 {
-  if (ownobj && dobj_ != NULL) delete dobj_;
+  if (ownobj_ && dobj_ != NULL) delete dobj_;
   if (column_ != NULL) delete [] column_;
 }
 
+void FITS_NTuple::Read(char inputfile[],int hdunum)
+{
+  ReadF(inputfile,hdunum);
+}
+void FITS_NTuple::ReadLines(char inputfile[],int firstLine, int numberOfLines,int hdunum)
+{
+  fistLineToBeRead_ = firstLine;
+  numberOfLinesToBeRead_ = numberOfLines;
+  ReadF(inputfile,hdunum);
+}
+
+
+
 void FITS_NTuple::Write(char outputfile[], bool OldFile)
 {
@@ -48 +67 @@
 }
 
-void FITS_NTuple::ReadFromFits(FitsFile& fn)
-{
-  if (!fn.IsFitsTable())
+void FITS_NTuple::ReadFromFits()
+{
+  //  if (!fn.IsFitsTable())
+    if (!IsFitsTable())
     {
       throw PException("ReadFromFits: the fits file seems not to be a bintable nor ASCII table");
     }
   int nbcols, nbentries;
-  nbcols = fn.NbColsFromFits();
+  //  nbcols = fn.NbColsFromFits();
+  nbcols = NbColsFromFits();
   nbentries = 0;
   int k;
-  for (k=0; k<nbcols; k++) nbentries=max( nbentries, fn.NentriesFromFits(k) );
+  //  for (k=0; k<nbcols; k++) nbentries=max( nbentries, fn.NentriesFromFits(k) );
+  for (k=0; k<nbcols; k++) nbentries=max( nbentries, NentriesFromFits(k) );
   
   char ** ColName = new char*[nbcols];
@@ -65 +87 @@
     {
       ColName[k] = new char[LONNOM1]; 
-      strncpy(ColName[k], fn.ColNameFromFits(k).c_str(),LONNOM);
+      //      strncpy(ColName[k], fn.ColNameFromFits(k).c_str(),LONNOM);
+      strncpy(ColName[k], ColNameFromFits(k).c_str(),LONNOM);
       ColName[k][LONNOM] =  '\0';
     }
   for (k=0; k<nbcols;k++)
     {
-      char ss= fn.ColTypeFromFits(k);
+      //      char ss= fn.ColTypeFromFits(k);
+      char ss= ColTypeFromFits(k);
       string type;
       if (ss != 'E') 
@@ -87 +111 @@
     { 
       dobj_= new NTuple(nbcols,ColName);
-      ownobj= true;      
+      ownobj_ = true;      
     }
   else 
@@ -99 +123 @@
     }
   delete [] ColName;
-    if (column_ != NULL) delete [] column_;
-    column_ = new float[nbentries];
+  //   if (column_ != NULL) delete [] column_;
+  //  column_ = new float[nbentries];
 
   // j'initialise le NTuple a zero, pour le dimensionner
   // (SetVal suppose que le ntuple est deja dimensionne)
   r_4* ligne = new r_4[nbcols];
-    for (k=0; k<nbcols; k++) ligne[k]=0.;
-    for (k=0; k<nbentries;k++) dobj_->Fill(ligne);
+  //  for (k=0; k<nbcols; k++) ligne[k]=0.;
+  //  for (k=0; k<nbentries;k++) dobj_->Fill(ligne);
+  //  delete [] ligne;
+
+  //%%%%%%
+    int firstln, lastln;
+    if (numberOfLinesToBeRead_ > 0) 
+      {
+        firstln = fistLineToBeRead_;
+        lastln = firstln + numberOfLinesToBeRead_;
+      }
+    else
+      {
+        firstln = 0;
+        lastln  = nbentries;
+      }
+    int numLigne;
+    for (numLigne=firstln; numLigne < lastln; numLigne++)
+      {
+        //      fn.GetBinTabLine(numLigne, ligne);
+        GetBinTabLine(numLigne, ligne);
+        dobj_->Fill(ligne);
+      }
     delete [] ligne;
-  for (k=0; k<nbcols;k++) 
-    {
-      fn.GetBinTabFCol(column_, nbentries, k);
-      for (int nent=0; nent<nbentries; nent++) dobj_->SetVal(nent,k, column_[nent]);
-    }
-  dobj_->Info()=fn.DVListFromFits();
-}
-void FITS_NTuple::WriteToFits(FitsFile& fn)
+
+    //%%%%%%%
+
+
+    //  for (k=0; k<nbcols;k++) 
+    //    {
+    //     fn.GetBinTabFCol(column_, nbentries, k);
+    //     for (int nent=0; nent<nbentries; nent++) dobj_->SetVal(nent,k, column_[nent]);
+    //   }
+    //  dobj_->Info()=fn.DVListFromFits();
+  dobj_->Info()=DVListFromFits();
+}
+void FITS_NTuple::WriteToFits()
 {
   if(dobj_ == NULL) 
@@ -147 +197 @@
   type[ncols]='\0';
   vector<int> dummy;
-  fn.makeHeaderBntblOnFits(type,Noms, nentries, ncols, dvl, extname, dummy);
+  //  fn.makeHeaderBntblOnFits(type,Noms, nentries, ncols, dvl, extname, dummy);
+  makeHeaderBntblOnFits(type,Noms, nentries, ncols, dvl, extname, dummy);
    for (k=0; k< ncols; k++)
     {