Changeset 2397 in Sophya for trunk

Timestamp:

Jun 5, 2003, 4:18:06 AM (22 years ago)

Author:

aubourg

Message:

securisation

Location:

trunk/ArchTOIPipe

Files:

• Kernel/piotoirdr.cc (modified) (4 diffs)
• ProcWSophya/toi2map.cc (modified) (4 diffs)
• TestPipes/tstseg3.cc (modified) (2 diffs)

trunk/ArchTOIPipe/Kernel/piotoirdr.cc

@@ -3 +3 @@
 //                               Christophe Magneville
 //                               Reza Ansari
-// $Id: piotoirdr.cc,v 1.8 2003-06-04 14:08:01 aubourg Exp $
+// $Id: piotoirdr.cc,v 1.9 2003-06-05 02:18:06 aubourg Exp $
 
 #include "piotoirdr.h"
@@ -27 +27 @@
 
 void PIOTOIReader::init() {
-  //pioTOI = new PIOObjectTOI(object.c_str(), "r");
   fits_lock();
   pioGroup = PIOOpenTOI(const_cast<char*>(group.c_str()), "r");
@@ -92 +91 @@
     char command[80];
     sprintf(command, "Begin=%d; End=%d", snb, sne);
-    double* data;
+    double* data = NULL;
     uint_8*   flags = NULL;
     PIOBYTE*  pioflags = NULL;
@@ -101 +100 @@
                            command,
                            pioGroup);
+    if ( n<0) {
+      cout << " PIOReadTOI : " << n << endl;
+      abort();
+    }
     if (flagdef != "") {
       PIOLONG nf = PIOReadFLGObjectMask(&pioflags,

trunk/ArchTOIPipe/ProcWSophya/toi2map.cc

@@ -3 +3 @@
 //                               Christophe Magneville
 //                               Reza Ansari
-// $Id: toi2map.cc,v 1.33 2003-01-27 07:56:04 aubourg Exp $
+// $Id: toi2map.cc,v 1.34 2003-06-05 02:18:06 aubourg Exp $
 
 #include "machdefs.h"
@@ -19 +19 @@
 TOI2Map::TOI2Map(string mapFName, string wmapFName, int nside) 
   : mMap(new SphereHEALPix<r_8>(nside)), mWMap(new SphereHEALPix<r_8>(nside)),
-    mWMapInternal(false), totnscount(0), usednscount(0),
-    mMapFName(mapFName), mWMapFName(wmapFName)
+    mMapFName(mapFName), mWMapFName(wmapFName),
+    mWMapInternal(false), totnscount(0), usednscount(0)
 {
   commonConst();
@@ -27 +27 @@
 ////////////////////////////////////////////////////////////////////////
 TOI2Map::TOI2Map(PixelMap<r_8>* map,PixelMap<r_8>* wmap)
-  : mMap(map), mWMap(wmap), mWMapInternal(false), totnscount(0), usednscount(0),
-    mMapFName(""), mWMapFName("")
+  : mMap(map), mWMap(wmap), mWMapInternal(false), 
+    mMapFName(""), mWMapFName(""),
+    totnscount(0), usednscount(0)
 {
   commonConst();
@@ -50 +51 @@
  int nlat = mMap->SizeIndex();
  string typmap = mMap->TypeOfMap();
+ cout << typmap << endl;
 
  if(mWMap==NULL) {

trunk/ArchTOIPipe/TestPipes/tstseg3.cc

@@ -11 +11 @@
   cout << "tsttoi starting" << endl;
   TOIManager* mgr = TOIManager::getManager();
-  mgr->setRequestedSample(104000000,104020000);
 
   FITSTOIReader r1(argv[1]);
@@ -20 +19 @@
  // ASCIITOIWriter w1("out1.data");
  // ASCIITOIWriter w2("out2.data");
+
+  w1.setRequestedSample(104000000,104020000);