Changeset 1300 in Sophya for trunk/SophyaExt/FitsIOServer/fitsxntuple.cc

Timestamp:

Nov 8, 2000, 11:02:58 AM (25 years ago)

Author:

ansari

Message:

classe FITS_AutoReader

File:

• trunk/SophyaExt/FitsIOServer/fitsxntuple.cc (modified) (3 diffs)

trunk/SophyaExt/FitsIOServer/fitsxntuple.cc

@@ -80 +80 @@
   for (k=0; k<nbcols;k++)
     {
-      char ss= is.ColTypeFromFits(k);
-      if (ss == 'D') DfitsCol.push_back(k);
-      else if (ss == 'E') FfitsCol.push_back(k);
-      else if (ss == 'I') IfitsCol.push_back(k);
-      else if (ss == 'S') SfitsCol.push_back(k);
+      FitsFile::FitsDataType ss= is.ColTypeFromFits(k);
+      if (ss == FitsFile::FitsDataType_double) DfitsCol.push_back(k);
+      else if (ss == FitsFile::FitsDataType_float) FfitsCol.push_back(k);
+      else if (ss == FitsFile::FitsDataType_int) IfitsCol.push_back(k);
+      else if (ss == FitsFile::FitsDataType_char) SfitsCol.push_back(k);
       else {
         cout << " FITS_XNTuple: colonne fits " << k << " type= " << ss << endl;
@@ -126 +126 @@
       if (ownobj_)
         {
-      (*dobj_)= XNTuple(DfitsCol.size(), FfitsCol.size(), IfitsCol.size(), SfitsCol.size(),ColName);
+          (*dobj_)= XNTuple(DfitsCol.size(), FfitsCol.size(), IfitsCol.size(), SfitsCol.size(),ColName);
         }
       else
         {
-        if (DfitsCol.size() != dobj_->NDVar() || FfitsCol.size() != dobj_->NFVar() ||  IfitsCol.size() != dobj_->NIVar() || SfitsCol.size() != dobj_->NSVar())
-
-          throw  SzMismatchError("FITS_XNTuple : structure incorrecte du ntuple");
+          if (DfitsCol.size() != dobj_->NDVar() || FfitsCol.size() != dobj_->NFVar() ||  IfitsCol.size() != dobj_->NIVar() || SfitsCol.size() != dobj_->NSVar())
+            {
+              cout << " WARNING : FITS_XNTuple : XNTuple reconfigured " << endl;
+              (*dobj_)= XNTuple(DfitsCol.size(), FfitsCol.size(), IfitsCol.size(), SfitsCol.size(),ColName);
+            }
         }
     }
@@ -227 +229 @@
   vector<int> StringSizes(dobj_->NSVar());
   for (k=0; k< StringSizes.size(); k++) StringSizes[k]=dobj_->mStrSz;
+  dvl["Content"]= "XNTuple";
+  dvl.SetComment("Content", "name of SOPHYA object");
   os.makeHeaderBntblOnFits(types, Noms, nrows, ncols, &dvl, extname,StringSizes);