Changeset 1221 in Sophya for trunk/SophyaExt

Timestamp:

Oct 5, 2000, 2:40:40 PM (25 years ago)

Author:

ansari

Message:

entree de dvlist dans makeheader... par pointeur

Location:

trunk/SophyaExt/FitsIOServer

Files:

• exclude (modified) (1 diff)
• fitsbntbllineRW.cc (modified) (2 diffs)
• fitsbntbllineRW.h (modified) (1 diff)
• fitsfile.cc (modified) (4 diffs)
• fitsfile.h (modified) (2 diffs)
• fitslocalmap.cc (modified) (1 diff)
• fitsntuple.cc (modified) (1 diff)
• fitsspherehealpix.cc (modified) (1 diff)
• fitstarray.cc (modified) (1 diff)
• fitsxntuple.cc (modified) (1 diff)

trunk/SophyaExt/FitsIOServer/exclude

@@ -1 +1 @@
 fitsioserver.cc
-
+fitsbntbllinereader.cc.encours
+fitsbntbllinereaderXX.cc
+fitsbntbllinereader.travail.cc
+fitsbntbllinereader.sv.cc
+fitsspherethetaphi.cc

trunk/SophyaExt/FitsIOServer/fitsbntbllineRW.cc

@@ -100 +100 @@
 
 
-FITS_BntblLineWriter::FITS_BntblLineWriter(char inputfile[],int dc, int fc,int ic, int cc, vector<string> names,DVList& dvl,  WriteMode wrm)
+FITS_BntblLineWriter::FITS_BntblLineWriter(char inputfile[],int dc, int fc,int ic, int cc, vector<string> names,DVList* ptr_dvl,  WriteMode wrm)
 {
   int k;
@@ -131 +131 @@
   string extname("Lines_on_Binary_tbl"); 
 
-  outFits_->makeHeaderBntblOnFits(types, names, 1, nbcols, dvl, extname,StringSizes); 
+  outFits_->makeHeaderBntblOnFits(types, names, 1, nbcols, ptr_dvl, extname,StringSizes); 
     ligne_.setFormat(dc, fc, ic, cc, names);
 

trunk/SophyaExt/FitsIOServer/fitsbntbllineRW.h

@@ -61 +61 @@
 
 public:
- FITS_BntblLineWriter(char inputfile[],int dc, int fc, int ic, int cc, vector<string> names, DVList& dvl, WriteMode wrm = clear);
+ FITS_BntblLineWriter(char inputfile[],int dc, int fc, int ic, int cc, vector<string> names, DVList* dvl=NULL, WriteMode wrm = clear);
 ~FITS_BntblLineWriter();
  void WriteNextLine( BnTblLine& WorkLine);

trunk/SophyaExt/FitsIOServer/fitsfile.cc

@@ -1158 +1158 @@
 \param <naxisn>  array containind sizes of the different dimensions
 */
-void FitsOutFile::makeHeaderImageOnFits(char type, int nbdim, int* naxisn,  DVList &dvl) 
+void FitsOutFile::makeHeaderImageOnFits(char type, int nbdim, int* naxisn,  DVList* ptr_dvl) 
 {
   int status = 0;
@@ -1191 +1191 @@
   // write supplementary keywords
   //  dvl.Print();
-  addKeywordsOfDVList(dvl);
+  if (ptr_dvl != NULL) addKeywordsOfDVList(*ptr_dvl);
 
   delete [] naxes;
@@ -1254 +1254 @@
 \param <taille_des_chaines> vector containing the number of characters of  data  for each char* typed column, with order of appearance in 'fieldType'
 */
-void FitsOutFile::makeHeaderBntblOnFits( string fieldType, vector<string> Noms, int nentries, int tfields, DVList &dvl, string extname, vector<int> taille_des_chaines) 
+void FitsOutFile::makeHeaderBntblOnFits( string fieldType, vector<string> Noms, int nentries, int tfields, DVList* ptr_dvl, string extname, vector<int> taille_des_chaines) 
 { 
   int k;
@@ -1345 +1345 @@
   //
   // write supplementary keywords
-  addKeywordsOfDVList(dvl);
+  if (ptr_dvl != NULL) addKeywordsOfDVList(*ptr_dvl);
 }
 

trunk/SophyaExt/FitsIOServer/fitsfile.h

@@ -210 +210 @@
 
    inline void firstImageOnPrimaryHeader() {imageOnPrimary_=true;}
-   void makeHeaderImageOnFits(char type, int nbdim, int* naxisn, DVList &dvl) ;
+   void makeHeaderImageOnFits(char type, int nbdim, int* naxisn, DVList* dvl) ;
    void PutImageToFits( int nbData, double* map) const;
    void PutImageToFits(int nbData, float* map ) const;
@@ -223 +223 @@
 
 
-   void makeHeaderBntblOnFits ( string fieldType, vector<string> Noms, int nentries, int tfields, DVList &dvl, string extname,  vector<int> taille_des_chaines) ;
+   void makeHeaderBntblOnFits ( string fieldType, vector<string> Noms, int nentries, int tfields, DVList* dvl, string extname,  vector<int> taille_des_chaines) ;
    void PutColToFits(int nocol, int nentries, double* donnees) const;
    void PutColToFits(int nocol, int nentries, float* donnees) const;

trunk/SophyaExt/FitsIOServer/fitslocalmap.cc

@@ -174 +174 @@
       }
   vector<int> dummy;
-  os.makeHeaderBntblOnFits(Type, Noms, dobj_->NbPixels(), 1, dvl, extname, dummy);
+  os.makeHeaderBntblOnFits(Type, Noms, dobj_->NbPixels(), 1, &dvl, extname, dummy);
   os.PutColToFits(0,  dobj_->NbPixels(), dobj_->DataBlock().Data()); 
 

trunk/SophyaExt/FitsIOServer/fitsntuple.cc

@@ -172 +172 @@
   vector<int> dummy;
 
-  os.makeHeaderBntblOnFits(type,Noms, nentries, ncols, dvl, extname, dummy);
+  os.makeHeaderBntblOnFits(type,Noms, nentries, ncols, &dvl, extname, dummy);
    float* column =  new float[nentries];
    for (k=0; k<ncols;k++)

trunk/SophyaExt/FitsIOServer/fitsspherehealpix.cc

@@ -113 +113 @@
       }
   vector<int> dummy;
-  os.makeHeaderBntblOnFits(Type, Noms, nPix, 1, dvl, extname, dummy);
+  os.makeHeaderBntblOnFits(Type, Noms, nPix, 1, &dvl, extname, dummy);
   os.PutColToFits(0,  nPix, dobj_->pixels_.Data()); 
 } 

trunk/SophyaExt/FitsIOServer/fitstarray.cc

@@ -134 +134 @@
     }
   cout << " nombre total d'elements a copier " << nbels << endl;
-  os.makeHeaderImageOnFits(type, nbdim, naxisn, dobj_->Info());
+  os.makeHeaderImageOnFits(type, nbdim, naxisn, &dobj_->Info());
   if (!dobj_->IsPacked()) 
     {

trunk/SophyaExt/FitsIOServer/fitsxntuple.cc

@@ -227 +227 @@
   vector<int> StringSizes(dobj_->NSVar());
   for (k=0; k< StringSizes.size(); k++) StringSizes[k]=dobj_->mStrSz;
-  os.makeHeaderBntblOnFits(types, Noms, nrows, ncols, dvl, extname,StringSizes); 
+  os.makeHeaderBntblOnFits(types, Noms, nrows, ncols, &dvl, extname,StringSizes); 
    
   int compt=0;