Changeset 1746 in Sophya for trunk/ArchTOIPipe

Timestamp:

Nov 12, 2001, 12:19:03 PM (24 years ago)

Author:

cmv

Message:

avec ou sans getdata bufferise cmv 12/11/2001

File:

• trunk/ArchTOIPipe/ProcWSophya/toi2map.cc (modified) (4 diffs)

trunk/ArchTOIPipe/ProcWSophya/toi2map.cc

@@ -3 +3 @@
 //                               Christophe Magneville
 //                               Reza Ansari
-// $Id: toi2map.cc,v 1.12 2001-11-10 00:14:55 aubourg Exp $
+// $Id: toi2map.cc,v 1.13 2001-11-12 11:19:03 cmv Exp $
 
 #include "machdefs.h"
@@ -84 +84 @@
 
 ////////////////////////////////////////////////////////////////////////
+// define SANS_BUFFER
 void TOI2Map::run()
 {
@@ -115 +116 @@
 double mjd = MJDfrYear(mActualYear);
 
- 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<<"TOI2Map::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
 for(int s=snb;s<=sne;s++) {
-  if (i0<0 ||
-      s<i0 ||
-      s>=i0+bufsz) {
-    i0 = s;
-    int nget = bufsz;
-    if (sne-s+1 < bufsz) {
-      nget = sne-s+1;
-    }
-    getData(0, i0, nget, bc1);
-    getData(1, i0, nget, bc2);
-    getData(2, i0, nget, bbolo, bfgbolo);
-  }
-
-  
   uint_8 fgbolo = 0;
-  double bolo;
+  double bolo,coord1,coord2;
   //              Equatoriales   /   Galactiques
   // coord1,2 =   alpha,delta    /   gLon,gLat
-  //double coord1 = getData(0,s);
-  //double coord2 = getData(1,s);
-
-  //getData(2,s,bolo,fgbolo);
-  bolo = bbolo[s-i0];
-  fgbolo = bfgbolo[s-i0];
-  double coord1 = bc1[s-i0];
-  double coord2 = bc2[s-i0];
+
+#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);
+  }
+  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);
+#endif
+
+  // Comme il n'y a pas de toi en sortie, il faut dire
+  // aux processeur/toi que l'on a plus besoin des donnees.
   if (s%100 == 0) wontNeedBefore(s-1);
   if(mTFlag && fgbolo&mBadFlag) continue;
@@ -201 +205 @@
  cout<<endl;
 
+#ifndef SANS_BUFFER
+delete [] bbolo; delete [] bfgbolo;
+delete [] bc1;   delete [] bc2;
+#endif
+
 //---------------------------------------------------------
 } catch (PException & exc) {