Changeset 2039 in Sophya

Timestamp:

May 31, 2002, 5:44:55 PM (23 years ago)

Author:

ansari

Message:

Ameliorations mineures (ProcSampleCount()) ds Map2TOI - Reza 31/5/2002

Location:

trunk/ArchTOIPipe

Files:

• ProcWSophya/map2toi.cc (modified) (2 diffs)
• ProcWSophya/map2toi.h (modified) (3 diffs)
• TestPipes/tstmap2toi.cc (modified) (9 diffs)

trunk/ArchTOIPipe/ProcWSophya/map2toi.cc

@@ -3 +3 @@
 //                               Christophe Magneville
 //                               Reza Ansari
-// $Id: map2toi.cc,v 1.10 2001-12-03 20:38:02 cmv Exp $
+// $Id: map2toi.cc,v 1.11 2002-05-31 15:44:54 ansari Exp $
 
 #include "toimanager.h"
@@ -14 +14 @@
 ////////////////////////////////////////////////////////////////////////
 Map2TOI::Map2TOI(SphereHEALPix<r_8>& sph)
-: mSph(sph)
+: mSph(sph), totnscount(0)
 {
  SetBad();

trunk/ArchTOIPipe/ProcWSophya/map2toi.h

@@ -5 +5 @@
 //                               Christophe Magneville
 //                               Reza Ansari
-// $Id: map2toi.h,v 1.7 2001-12-03 20:38:02 cmv Exp $
+// $Id: map2toi.h,v 1.8 2002-05-31 15:44:55 ansari Exp $
 
 #ifndef MAP2TOI_H
@@ -62 +62 @@
   // Print
   void Print(::ostream & os);
+  inline int_8  ProcessedSampleCount() const { return totnscount; }
 
 protected:
@@ -68 +69 @@
   unsigned long long mBadFlag;
   double mActualYear;
+
+  int_8 totnscount;   // Nombre total d'echantillon processe
 };
 

trunk/ArchTOIPipe/TestPipes/tstmap2toi.cc

@@ -24 +24 @@
  cout<<"tstmap2toi [-h] [-p lp] [-s samplemin,samplemax] [-w data_window_size]"<<endl
      <<"           [-a label_coord1In] [-d label_coord2In] [-b label_bolomuv]"<<endl
-     <<"           [-i c,h] [-m c,h]"<<endl
+     <<"           [-i c,h] [-m c,h] [-C] "<<endl
      <<"           fitsin_point fitsphere fitsout"<<endl
      <<" -p lp : print level (def=0)"<<endl
@@ -37 +37 @@
      <<" -e equi : equinoxe en annee (def=2000.)"<<endl
      <<" -I : sampleNum are implicit in fits files (def=no)"<<endl
+     <<" -C : Copy ccordIn to output  fits file (def=no)"<<endl
      <<" fitsin_point : fits file for pointing"<<endl
      <<" fitsphere : fits file for input Healpix sphere"<<endl
@@ -55 +56 @@
 long sdeb,sfin;
 bool snimplicit = false;
+bool fgcopycoord = false;
 int c;
 while((c = getopt(narg,arg,"hIp:s:w:a:d:b:i:m:e:")) != -1) {
@@ -93 +95 @@
   case 'I' :
     snimplicit = true;
+    break;
+  case 'C' :
+    fgcopycoord = true;
     break;
   case 'h' :
@@ -162 +167 @@
  m2toi.addInput("Coord1In",toicoord1in);
 
+ if (fgcopycoord) {
 #ifdef TOISEQBUFFERED
  TOISeqBuffered * toicoord1out = new TOISeqBuffered("toi_coord1_out",width);
@@ -169 +175 @@
  m2toi.addOutput("Coord1Out",toicoord1out);
  wfits.addInput(label_coord1,toicoord1out);
+ }
 
 #ifdef TOISEQBUFFERED
@@ -178 +185 @@
  rfits.addOutput(label_coord2,toicoord2in);
  m2toi.addInput("Coord2In",toicoord2in);
-
+ 
+ if (fgcopycoord) {
 #ifdef TOISEQBUFFERED
  TOISeqBuffered * toicoord2out = new TOISeqBuffered("toi_coord2_out",width);
@@ -186 +194 @@
  m2toi.addOutput("Coord2Out",toicoord2out);
  wfits.addInput(label_coord2,toicoord2out);
+ }
 
 #ifdef TOISEQBUFFERED
@@ -214 +223 @@
 
  //  Affichage de l'avancement des TOIProcessors 
- //ProcSampleCounter<FITSTOIReader>  stats(rfits);
- //stats.InfoMessage() = "tstmap2toi/Info";
- //stats.PrintStats();
+ ProcSampleCounter<Map2TOI>  stats(m2toi);
+ stats.InfoMessage() = "tstmap2toi/Info";
+ stats.PrintStats();
 
  mgr->joinAll();