Changeset 1744 in Sophya

Timestamp:

Nov 10, 2001, 1:14:55 AM (24 years ago)

Author:

aubourg

Message:

optim...

Location:

trunk/ArchTOIPipe

Files:

• Kernel/fitstoirdr.cc (modified) (5 diffs)
• Kernel/toisegment.cc (modified) (2 diffs)
• ProcWSophya/toi2map.cc (modified) (2 diffs)

trunk/ArchTOIPipe/Kernel/fitstoirdr.cc

@@ -3 +3 @@
 //                               Christophe Magneville
 //                               Reza Ansari
-// $Id: fitstoirdr.cc,v 1.17 2001-11-08 15:47:44 aubourg Exp $
+// $Id: fitstoirdr.cc,v 1.18 2001-11-10 00:14:54 aubourg Exp $
 
 #include "fitstoirdr.h"
@@ -214 +214 @@
    if(colsinput[k].second) colflg[k] = new long[Buff_Sz];
  }
+ uint_8 * tmpflg = new uint_8[Buff_Sz];
 
  //////// Read data and put into pipe
@@ -253 +254 @@
    if(sn > mgr->getRequestedEnd()) break;
    if(sn < mgr->getRequestedBegin()) continue;
+#if 0
    for(int k=0; k<getNOut(); k++) {
      if(colval[k]==NULL)  continue;
@@ -258 +260 @@
      putData(k,sn,colval[k][ip],flg);
    }
+#else
+   if (ip == 0) { 
+     for(int k=0; k<getNOut(); k++) {
+       if(colval[k]==NULL)  continue;
+       if (colflg[k] != NULL) {
+         for (int ii=0; ii<Buff_Sz; ii++) {
+           tmpflg[ii] = colflg[k][ii];
+         }
+         putData(k, sn, ifin-ideb+1, colval[k], tmpflg);
+       } else {
+         putData(k, sn, ifin-ideb+1, colval[k]);
+       }
+     }
+   }
+#endif
    totnscount++;
  }
@@ -263 +280 @@
  //////// des-allocate buffers
  delete [] samplenum;
+ delete [] tmpflg;
  for(int k=0; k<getNOut(); k++) {
    if(colval[k]!=NULL) delete [] colval[k];

trunk/ArchTOIPipe/Kernel/toisegment.cc

@@ -3 +3 @@
 //                               Christophe Magneville
 //                               Reza Ansari
-// $Id: toisegment.cc,v 1.16 2001-11-09 23:13:15 aubourg Exp $
+// $Id: toisegment.cc,v 1.17 2001-11-10 00:14:55 aubourg Exp $
 
 #include "toisegment.h"
@@ -187 +187 @@
 
 void TOISegmented::BufferSegment::putData(int sn, int n, double const* d, uint_8 const* f) {
-  checkCommitted();
+  if (status == NEW) {
+    status = WRITE;
+    sn0 = sn;
+  }
+  if (status == COMMITTED) {
+    throw(ForbiddenError("TOISegment : putData in committed buffer"));
+  }
   checkInRange(sn);
   checkInRange(sn+n-1);

trunk/ArchTOIPipe/ProcWSophya/toi2map.cc

@@ -3 +3 @@
 //                               Christophe Magneville
 //                               Reza Ansari
-// $Id: toi2map.cc,v 1.11 2001-11-08 15:47:46 aubourg Exp $
+// $Id: toi2map.cc,v 1.12 2001-11-10 00:14:55 aubourg Exp $
 
 #include "machdefs.h"
@@ -115 +115 @@
 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;
+
 // 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;
   //              Equatoriales   /   Galactiques
   // coord1,2 =   alpha,delta    /   gLon,gLat
-  double coord1 = getData(0,s);
-  double coord2 = getData(1,s);
-
-  getData(2,s,bolo,fgbolo);
+  //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];
   if (s%100 == 0) wontNeedBefore(s-1);
   if(mTFlag && fgbolo&mBadFlag) continue;