Changeset 3671 in Sophya for trunk/AddOn/TAcq/minifits.cc

Timestamp:

Nov 13, 2009, 11:54:04 AM (16 years ago)

Author:

ansari

Message:

• Nettoyage complet des programmes d'acquisition
• Ajout methode BRPaquet::CopyFrom() pour reduction de paquet
• Introduction des classes BRParList , BRConfList , BRAcqConfig
• Introduction du nouveau programme acquisition mfacq.cc (MultiFibresAcq)

Reza, 13/11/2009

File:

• trunk/AddOn/TAcq/minifits.cc (modified) (5 diffs)

trunk/AddOn/TAcq/minifits.cc

@@ -97 +97 @@
   if (fip != NULL) throw MiniFITSException("MiniFITSFile::Open() - fip != NULL");
   if (rwm == MF_Write) {
+    for(int i=0; i<MFITSHLEN; i++)  header[i]=' ';
+    nkeya_ = 0;
     FillHeader();
     fip = fopen(nom, "w");
@@ -119 +121 @@
 {
   if (fip) { 
-        if (rwmode == MF_Write)  {  
-          // on remplit avec des zeros pour avoir une longueur multiple de 2880 
-          size_t padsz = MFITSHLEN-(totwsz%MFITSHLEN);
-          char zeros[160];
-          for(size_t k=0; k<160; k++) zeros[k]=0;
-          while(padsz>160) {
-            fwrite(zeros, 1, 160, fip);
-            padsz-=160;
-          }
-          if (padsz>0)  fwrite(zeros, 1, padsz, fip);
-          // On reecrit l'entete 
-          FillHeader();
-          fseek(fip, 0, SEEK_SET);
-          fwrite(header, 1, MFITSHLEN, fip);
-        }       
-        fclose(fip);
+    if (rwmode == MF_Write)  {  
+      // on remplit avec des zeros pour avoir une longueur multiple de 2880     
+      size_t padsz = MFITSHLEN-(totwsz%MFITSHLEN);
+      char zeros[160];
+      for(size_t k=0; k<160; k++) zeros[k]=0;
+      while(padsz>160) {
+        fwrite(zeros, 1, 160, fip);
+        padsz-=160;
+      }
+      if (padsz>0)  fwrite(zeros, 1, padsz, fip);
+      // On reecrit l'entete 
+      FillHeader();
+      fseek(fip, 0, SEEK_SET);
+      fwrite(header, 1, MFITSHLEN, fip);
+    }   
+    fclose(fip);
   }
   fip = NULL;
@@ -187 +189 @@
   else if (dtype == MF_Float32) bpix = -32;
   char * buff = header+80;
-  sprintf(buff, "BITPIX  = %20d /   number of bits per data pixel", bpix);
+  sprintf(buff, "BITPIX  = %20d / number of bits per data pixel", bpix);
   buff[strlen(buff)] = ' ';
   buff = header+160;
@@ -193 +195 @@
   buff[strlen(buff)] = ' ';
   buff = header+240;
-  sprintf(buff, "NAXIS1  = %20ld /   number of bits per data pixel", (long)nax1);
+  sprintf(buff, "NAXIS1  = %20ld / nb of pixels along X = PaquetSize", (long)nax1);
   buff[strlen(buff)] = ' ';
   buff = header+320;
-  sprintf(buff, "NAXIS2  = %20ld /   number of bits per data pixel", (long)nax2);
+  sprintf(buff, "NAXIS2  = %20ld / nb of rows = NumberOfPaquets", (long)nax2);
   buff[strlen(buff)] = ' ';
   buff = header+400+nkeya_*80;
@@ -248 +250 @@
     sprintf(buff,"%s %20lg / %s", cle, val, tcom);
   }
-  else  sprintf(buff,"%s %20ld / ", cle, val);
+  else  sprintf(buff,"%s %20lg / ", cle, val);
   buff[strlen(buff)] = ' ';
   nkeya_++;