Changeset 2038 in Sophya

Timestamp:

May 31, 2002, 11:55:42 AM (23 years ago)

Author:

cecile

Message:

...

Location:

trunk/ArchTOIPipe/ProcWSophya

Files:

• flag2map.cc (modified) (5 diffs)
• flag2map.h (modified) (1 diff)

trunk/ArchTOIPipe/ProcWSophya/flag2map.cc

@@ -3 +3 @@
 //                               Christophe Magneville
 //                               Reza Ansari
-// $Id: flag2map.cc,v 1.2 2002-05-29 10:18:45 ansari Exp $
+// $Id: flag2map.cc,v 1.3 2002-05-31 09:55:42 cecile Exp $
 
 #include "machdefs.h"
@@ -127 +127 @@
 
 cout<<"FLAG2Map::run() from "<<snb<<" to "<<sne;
-#ifndef SANS_BUFFER
-int bufsz = 100;
-uint_8* bfgbolo = new uint_8[bufsz];
-double* bbolo   = new double[bufsz];
-double* bc1     = new double[bufsz];
-double* bc2     = new double[bufsz];
-int i0 = -1;
-cout<<" (getData() bufferized)"<<endl;
-#else
 cout<<" (getData() not bufferized)"<<endl;
-#endif
 
 // Remplissage des spheres
@@ -146 +136 @@
   // coord1,2 =   alpha,delta    /   gLon,gLat
 
-#ifndef SANS_BUFFER
-  if(i0<0 || s<i0 || s>=i0+bufsz) {
-    i0 = s;
-    int nget = (sne-s+1<bufsz)? nget=sne-s+1: bufsz;
-    getData(0,i0,nget,bc1);
-    getData(1,i0,nget,bc2);
-    getData(2,i0,nget,bbolo,bfgbolo);
-    totnscount += nget;
-  }
-  bolo = bbolo[s-i0]; fgbolo = bfgbolo[s-i0];
-  coord1 = bc1[s-i0]; coord2 = bc2[s-i0];
-#else
-  getData(2,s,bolo,fgbolo);
   coord1 = getData(0,s);
   coord2 = getData(1,s);
+  getData(2,s,bolo,fgbolo);
   totnscount++;
-#endif
+
+  if (fgbolo > 0)
+    cout << "sn " << s << " val " << bolo << " fgbolo " << fgbolo << endl;
 
   // Comme il n'y a pas de toi en sortie, il faut dire
@@ -170 +150 @@
   if(mTMin && bolo<mValMin) continue;
   if(mTMax && bolo>mValMax) continue;
-
-  cout << "sn " << s << " val " << bolo << " fgbolo " << fgbolo << endl;
   
 
@@ -224 +202 @@
  cout<<"  BadCoorRange="<<BadCoorRange<<endl;
 
-#ifndef SANS_BUFFER
-delete [] bbolo; delete [] bfgbolo;
-delete [] bc1;   delete [] bc2;
-#endif
 
 //---------------------------------------------------------

trunk/ArchTOIPipe/ProcWSophya/flag2map.h

@@ -5 +5 @@
 //                               Christophe Magneville
 //                               Reza Ansari
-// $Id: flag2map.h,v 1.1 2002-05-28 18:01:47 cecile Exp $
+// $Id: flag2map.h,v 1.2 2002-05-31 09:55:42 cecile Exp $
 
 #ifndef FLAG2MAP_H