Changeset 1499 in Sophya for trunk/SophyaExt/FitsIOServer/fitsfile.cc

Timestamp:

May 17, 2001, 6:26:45 PM (24 years ago)

Author:

lemeur

Message:

lecture xntuple par blocs et complement de types

File:

• trunk/SophyaExt/FitsIOServer/fitsfile.cc (modified) (2 diffs)

trunk/SophyaExt/FitsIOServer/fitsfile.cc

@@ -680 +680 @@
   int ncol;
   long nels=1;
+  int ligneAsolue = NoLine+1;
   for (ncol=0; ncol<nbcols_; ncol++)
     {
+      int repetition =repeat_[ncol]; 
+      int ligneALire = ligneAsolue/repetition;
+      int premierElement  = ligneAsolue-ligneALire*repetition;
+      if (premierElement != 0 )
+        {
+          ligneALire++;
+        }
+      else premierElement = repetition;
+
       switch (types_[ncol])
         { 
         case FitsDataType_double :
-          fits_read_col(fptr_,TDOUBLE,ncol+1,NoLine+1,1,1,&dnull,&ddata[dcount++],&anull,&status);
+          {
+          fits_read_col(fptr_,TDOUBLE,ncol+1,ligneALire,premierElement,1,&dnull,&ddata[dcount++],&anull,&status);
             break;
-        case FitsDataType_float :
-          fits_read_col(fptr_,TFLOAT,ncol+1,NoLine+1,1,1,&fnull,&fdata[fcount++],&anull,&status);
+          }
+        case FitsDataType_float :         
+          fits_read_col(fptr_,TFLOAT,ncol+1,ligneALire,premierElement,1,&fnull,&fdata[fcount++],&anull,&status);
           break;
         case  FitsDataType_int :
-          fits_read_col(fptr_,TINT,ncol+1,NoLine+1,1,1,&inull,&idata[icount++],
+          fits_read_col(fptr_,TINT,ncol+1,ligneALire,premierElement,1,&inull,&idata[icount++],
                         &anull,&status);
           break;
+        case  FitsDataType_long :
+          fits_read_col(fptr_,TLONG,ncol+1,ligneALire,premierElement,1,&inull,&idata[icount++], &anull,&status);
+        case  FitsDataType_byte :
+          {
+            unsigned char uschar = 0;
+            fits_read_col(fptr_,TBYTE,ncol+1,ligneALire,premierElement,1,&inull,&uschar, &anull,&status);
+            idata[icount++] = (int)uschar;
+          }
+          break;
         case FitsDataType_char :
-          fits_read_col(fptr_,TSTRING,ncol+1,NoLine+1,1,1,cnull,&cdata[ccount++],&anull,&status);
+          fits_read_col(fptr_,TSTRING,ncol+1,ligneALire,premierElement,1,cnull,&cdata[ccount++],&anull,&status);
           break;
         }
@@ -1586 +1607 @@
       cout << " WARNING : types don't match (PutColToFits) : on fits file= " << code << " to be written= DOUBLE " << endl;
     } 
+  //  cout << " 10 elements de colonne " << endl;
+  //  for (int toto=0; toto < 10; toto++) cout << donnees[toto] << endl;
   fits_write_col(fptr_,TDOUBLE,nocol+1,1,1,nentries, donnees ,&status);
   if( status )  printerror( status,"erreur ecriture du fichier fits" );