Changeset 2209 in Sophya

Timestamp:

Oct 9, 2002, 11:12:52 AM (23 years ago)

Author:

lemeur

Message:

mise aux normes de for(int k= ...)

Location:

trunk/SophyaExt/FitsIOServer

Files:

• fitsautoreader.cc (modified) (2 diffs)
• fitsfile.cc (modified) (9 diffs)
• fitsntuple.cc (modified) (1 diff)
• fitsxntuple.cc (modified) (4 diffs)

trunk/SophyaExt/FitsIOServer/fitsautoreader.cc

@@ -98 +98 @@
         {
           int index=0;
-          for (int k=0; k < inFits_->NbColsFromFits(); k++) 
+          int k;
+          for (k=0; k < inFits_->NbColsFromFits(); k++) 
             {
               if (inFits_->ColTypeFromFits(k) != FitsFile::FitsDataType_float)
@@ -112 +113 @@
               {
                 int maxEntries=0;
-                for (int k=0; k < inFits_->NbColsFromFits(); k++) 
+                int k;
+                for ( k=0; k < inFits_->NbColsFromFits(); k++) 
                   {
                     if (inFits_->NentriesFromFits(k) > maxEntries ) maxEntries =  inFits_->NentriesFromFits(k); 

trunk/SophyaExt/FitsIOServer/fitsfile.cc

@@ -23 +23 @@
       }
     ColName_ = vector<string>(nbcols);
-     for (int k=0; k < maxName; k++) ColName_[k] = names[k];
+    int k;
+    for (k=0; k < maxName; k++) ColName_[k] = names[k];
     if (dc >0) ddata_ = vector<double>(dc);
     if (fc >0) fdata_ = vector<float>(fc);
@@ -78 +79 @@
   int bc=0;
   id_  = vector< pair<FitsFile::FitsDataType, int> >(types.size());
-  for (int k= 0; k < types.size(); k++)
+  int k;
+  for (k= 0; k < types.size(); k++)
     {
       switch( types[k] )
@@ -146 +148 @@
 
   cout << " doubles : " << endl;
-  for (int k=0; k< ddata_.size(); k++)
+  int k;
+  for (k=0; k< ddata_.size(); k++)
     {
       cout << ddata_[k] << " " ;
@@ -153 +156 @@
 
   cout << " floats : " << endl;
-  for (int k=0; k< fdata_.size(); k++)
+  for (k=0; k< fdata_.size(); k++)
     {
       cout << fdata_[k] << " " ;
@@ -160 +163 @@
 
   cout << " entiers courts: " << endl;
-  for (int k=0; k< shdata_.size(); k++)
+  for (k=0; k< shdata_.size(); k++)
     {
       cout << shdata_[k] << " " ;
@@ -166 +169 @@
   cout << endl;
   cout << " entiers : " << endl;
-  for (int k=0; k< idata_.size(); k++)
+  for (k=0; k< idata_.size(); k++)
     {
       cout << idata_[k] << " " ;
@@ -173 +176 @@
 
   cout << " entiers longs : " << endl;
-  for (int k=0; k< ldata_.size(); k++)
+  for (k=0; k< ldata_.size(); k++)
     {
       cout << ldata_[k] << " " ;
@@ -180 +183 @@
 
   cout << " chaines carac.  : " << endl;
-  for (int k=0; k< cdata_.size(); k++)
+  for (k=0; k< cdata_.size(); k++)
     {
       cout << cdata_[k] << " " ;
@@ -187 +190 @@
 
   cout << " bytes : " << endl;
-  for (int k=0; k< bdata_.size(); k++)
+  for (k=0; k< bdata_.size(); k++)
     {
       cout << (char)bdata_[k] << " " ;

trunk/SophyaExt/FitsIOServer/fitsntuple.cc

@@ -183 +183 @@
    for (k=0; k<ncols;k++)
      {
-       for(int j = 0; j < nentries; j++) column[j]= dobj_->GetVal(j,k);
+       int j;
+       for(j = 0; j < nentries; j++) column[j]= dobj_->GetVal(j,k);
        os.PutColToFits(k, nentries, column);
      }

trunk/SophyaExt/FitsIOServer/fitsxntuple.cc

@@ -297 +297 @@
   // table will have 'nrows' rows
   int nrows = dobj_->NEntry();
-  cout << " FITS_XNTuple::WriteToFits : nombre de lignes a ecrire " << nrows << endl;
+  //  cout << " FITS_XNTuple::WriteToFits : nombre de lignes a ecrire " << nrows << endl;
   // get names and values from the join DVList object
   DVList dvl= dobj_->Info();
@@ -337 +337 @@
        for (k=0; k<dobj_->NDVar();k++)
          {
-           for(int j = 0; j < nrows; j++) dcolumn[j]= dobj_->GetDVal(j,compt);
+           int j;
+           for(j = 0; j < nrows; j++) dcolumn[j]= dobj_->GetDVal(j,compt);
            os.PutColToFits(compt, nrows, dcolumn);
            compt++;
@@ -349 +350 @@
        for (k=0; k<dobj_->NFVar();k++)
          {
-           for(int j = 0; j < nrows; j++) fcolumn[j]= dobj_->GetFVal(j,compt);
+           int j;
+           for(j = 0; j < nrows; j++) fcolumn[j]= dobj_->GetFVal(j,compt);
            os.PutColToFits(compt, nrows, fcolumn);
            compt++;
@@ -361 +363 @@
        for (k=0; k<dobj_->NIVar();k++)
          {
-           for(int j = 0; j < nrows; j++) icolumn[j]= dobj_->GetIVal(j,compt);
-           cout << " fitsx.. va ecrire la colonne " << endl;
-           for(int j = 0; j < nrows; j++) cout << icolumn[j] << endl;;
+           int j; 
+           for(j = 0; j < nrows; j++) icolumn[j]= dobj_->GetIVal(j,compt);
+           //      for(j = 0; j < nrows; j++) cout << icolumn[j] << endl;;
 
            os.PutColToFits(compt, nrows, icolumn);