Changeset 1801 in Sophya

Timestamp:

Nov 30, 2001, 4:02:04 PM (24 years ago)

Author:

aubourg

Message:

gph424 parallele

Location:

trunk/ArchTOIPipe

Files:

• Kernel/fitstoirdr.cc (modified) (4 diffs)
• TestPipes/quickmap_p.cc (modified) (3 diffs)

trunk/ArchTOIPipe/Kernel/fitstoirdr.cc

@@ -3 +3 @@
 //                               Christophe Magneville
 //                               Reza Ansari
-// $Id: fitstoirdr.cc,v 1.23 2001-11-29 18:19:32 aubourg Exp $
+// $Id: fitstoirdr.cc,v 1.24 2001-11-30 15:02:04 aubourg Exp $
 
 #include "fitstoirdr.h"
@@ -223 +223 @@
  uint_8 * tmpflg = new uint_8[Buff_Sz];
 
+ TOIManager* mgr = TOIManager::getManager();
+
  //////// Read data and put into pipe
  long ideb=-1,ifin=-1;
@@ -234 +236 @@
      long n = ifin-ideb+1;
      int anyNul;
-     fits_lock();
      if (implicitSN) {
+       if (ideb+implicitSNStart > mgr->getRequestedEnd() 
+           || ideb+implicitSNStart > forcedMaxIn) break;
+       if (ifin+implicitSNStart < mgr->getRequestedBegin()
+           || ifin+implicitSNStart < forcedMinIn) continue;
        for (long j=0; j<Buff_Sz; j++) {
          samplenum[j] = j+ideb+implicitSNStart;
        }
+       fits_lock();
      } else {
+       fits_lock();
        fits_read_col_dbl(fptr,1,ideb+1,1,n,0,samplenum,&anyNul,&fstatus);
+       if (ideb+implicitSNStart > mgr->getRequestedEnd() 
+           || ideb+implicitSNStart > forcedMaxIn) {
+         fits_unlock();
+         break;
+       }
+       if (ifin+implicitSNStart < mgr->getRequestedBegin()
+           || ifin+implicitSNStart < forcedMinIn) {
+         fits_unlock();
+         continue;
+       }
      }
      for(int k=0; k<getNOut(); k++) {
@@ -258 +275 @@
    long ip = i-ideb; // pointeurs dans les buffers
    long sn = (long) (samplenum[ip]+.1);
-   TOIManager* mgr = TOIManager::getManager();
-   if(samplenum[0] > mgr->getRequestedEnd()) break;
-   if(samplenum[0] > forcedMaxIn) break;
-   if(samplenum[ifin-ideb] < mgr->getRequestedBegin()) continue;
-   if(samplenum[ifin-ideb] < forcedMinIn) continue;
    if (ip == 0) { 
      for(int k=0; k<getNOut(); k++) {

trunk/ArchTOIPipe/TestPipes/quickmap_p.cc

@@ -1 +1 @@
 // GPH 424.1   Planck HFI-L2 Simple Map Making
 // Eric Aubourg     CEA/DAPNIA/SPP
-// $Id: quickmap_p.cc,v 1.1 2001-11-29 18:19:32 aubourg Exp $
+// $Id: quickmap_p.cc,v 1.2 2001-11-30 15:02:04 aubourg Exp $
 
 #include <stdlib.h>
@@ -370 +370 @@
     cout<<"Creating map fits file "<<prefs.output.fname<<endl;
     // Would need some generic mechanism here $CHECK$ $$TBD$$
-    if (smap->TypeOfMap() == "RING") {
+    if ((string)smap->TypeOfMap() == "RING") {
       sfits << * (SphereHEALPix<r_8>*)smap;
-    } else if (smap->TypeOfMap() == "LOCAL") {
+    } else if ((string)smap->TypeOfMap() == "LOCAL") {
       sfits << * (LocalMap<r_8>*)smap;
     } else {
@@ -383 +383 @@
     cout<<"Creating map weight fits file "<<prefs.output.wfname<<endl;
     //    swfits << *wmap;
-    if (swmap->TypeOfMap() == "RING") {
+    if ((string)swmap->TypeOfMap() == "RING") {
       swfits << * (SphereHEALPix<r_8>*)swmap;
-    } else if (swmap->TypeOfMap() == "LOCAL") {
+    } else if ((string)swmap->TypeOfMap() == "LOCAL") {
       swfits << * (LocalMap<r_8>*)swmap;
     } else {