Changeset 2031 in Sophya for trunk/ArchTOIPipe

Timestamp:

May 30, 2002, 2:53:22 PM (23 years ago)

Author:

ansari

Message:

Correction de pb divers (8) - Reza 30/5/2002

File:

• trunk/ArchTOIPipe/TestPipes/aksj02.cc (modified) (9 diffs)

trunk/ArchTOIPipe/TestPipes/aksj02.cc

@@ -289 +289 @@
     offes.SavePolyNTuple(soff_nt, soff_nt_ppfname);
 
-    SimpleOffsetEstimator offes2;
+    SimpleOffsetEstimator* offes2;
     if (soff2_dofg) {
       cout << "> Creating 2nd SimpleOffsetEstimator(" << soff2_mwsz << "," << soff2_nptfit 
            << "," << soff2_degpol << ")" << endl;
-      offes2.SetParams(soff2_mwsz, soff2_nptfit, soff2_degpol);
-      offes2.SavePolyNTuple(soff2_nt, soff2_nt_ppfname);
-    }
-
-    if (gfilt_fg) 
+      offes2 = new SimpleOffsetEstimator(soff2_mwsz, soff2_nptfit, soff2_degpol);
+      offes2->SavePolyNTuple(soff2_nt, soff2_nt_ppfname);
+    }
+
+    SimpleFilter *filt = NULL;
+    if (gfilt_fg) {
       cout << "> Creating a GaussianFilter SimpleFilter Object " << endl;
-    double G_sigma = gfilt_sigma;
-    double G_a = 1./(G_sigma*sqrt(M_PI*2.));
-    SimpleFilter filt(gfilt_wsz, SimpleFilter::GaussFilter, G_a, G_sigma);
-
+      double G_sigma = gfilt_sigma;
+      double G_a = 1./(G_sigma*sqrt(M_PI*2.));
+      filt = new SimpleFilter(gfilt_wsz, SimpleFilter::GaussFilter, G_a, G_sigma);
+    }
          
     FITSTOIReader* rbgal = NULL;
@@ -317 +318 @@
     if (soff2_dofg && bgalfile && bgal2cut) { 
       cout << "  offes2.SetBGalCut( " << bmin2 << "," << bmax2 << ")" << endl;
-      offes2.SetBGalCut(bmin, bmax);      
+      offes2->SetBGalCut(bmin, bmax);      
     }
 
@@ -336 +337 @@
       outname = "bgalcopie";
       plombier.Connect(*rbgal, bgaltoi, offes, inname);      
-      plombier.Connect(offes, outname, offes2, inname);      
+      plombier.Connect(offes, outname, *offes2, inname);      
     }
     else if (soff2_dofg && bgal2cut) {
       inname = "bgal";
-      plombier.Connect(*rbgal, bgaltoi, offes2, inname);      
+      plombier.Connect(*rbgal, bgaltoi, *offes2, inname);      
     }
     else if (bgalcut) {
@@ -350 +351 @@
       inname = "in";
       outname = "out";
-      plombier.Connect(offes, outname, offes2, inname);      
+      plombier.Connect(offes, outname, *offes2, inname);      
       if (bgalcut) {
         inname = "bgal";
         outname = "bgalcopie";
-        plombier.Connect(offes, outname, offes2, inname);            
+        plombier.Connect(offes, outname, *offes2, inname);            
       }
     }
@@ -360 +361 @@
     if (gfilt_fg) {
       if (soff2_dofg)
-        plombier.Connect(offes2, "out", filt, "in");
+        plombier.Connect(*offes2, "out", *filt, "in");
       else 
-        plombier.Connect(offes, "out", filt, "in");
-      plombier.Connect(filt, "out", w, "outfcln", "", 0, fg_wrtflag);
+        plombier.Connect(offes, "out", *filt, "in");
+      plombier.Connect(*filt, "out", w, "outfcln", "", 0, fg_wrtflag);
     }
     else {
       if (soff2_dofg)
-        plombier.Connect(offes2, "out", w, "outcln", "", 0, fg_wrtflag);
+        plombier.Connect(*offes2, "out", w, "outcln", "", 0, fg_wrtflag);
       else 
         plombier.Connect(offes, "out", w, "outcln", "", 0, fg_wrtflag);
@@ -376 +377 @@
       plombier.Connect(offes, "offset", w, "offset");
       if (soff2_dofg)
-        plombier.Connect(offes2, "offset", w, "offset2");
+        plombier.Connect(*offes2, "offset", w, "offset2");
     }
     if (fg_wrtms) {
@@ -388 +389 @@
     cout << cleaner;
     cout << offes;
-    if (soff2_dofg)  cout << offes2;
+    if (soff2_dofg)  cout << *offes2;
     cout << w;
 
@@ -405 +406 @@
     cout << cleaner;
     cout << offes;
-    if (soff2_dofg)  cout << offes2;
-    if (gfilt_fg)  cout << filt;
+    if (soff2_dofg)  cout << *offes2;
+    if (gfilt_fg)  cout << *filt;
     cout << w;
 
@@ -412 +413 @@
     PrtTim("End threads");
     if (bgalcut)  delete rbgal;
-
+    if (gfilt_fg)  delete filt;
+    if (soff2_dofg)  delete offes2;
   }
   catch (PThrowable & exc) {