Changeset 2054 in Sophya for trunk/ArchTOIPipe/ProcWSophya

Timestamp:

Jun 11, 2002, 7:14:26 PM (23 years ago)

Author:

ansari

Message:

corrections pour proj ds localmap - Reza 11/6/2002

Location:

trunk/ArchTOIPipe/ProcWSophya

Files:

• simcleaner.cc (modified) (6 diffs)
• simcleaner.h (modified) (2 diffs)
• toi2map.cc (modified) (2 diffs)

trunk/ArchTOIPipe/ProcWSophya/simcleaner.cc

@@ -20 +20 @@
   SetCleanForMeanThrNSig();
   SetFlaggingThrNSig();
-
+  
   SetRange();
+  SetFlagMask();
+
   FillMeanSigNTuple();
   char* noms[] = {"sn","mean","sigma"};
@@ -29 +31 @@
   totnbblock = 0;
   ns_outofrange = ns_flag1p = ns_flag2p = ns_flag1m = ns_flag2m = 0;
+  ns_inflagged = 0;
+  ns_cleannsig = 0;
   gl_sum = gl_sum2 = 0.;  ns_glms = 0;
 }
@@ -51 +55 @@
   TOIProcessor::PrintStatus(os);
   os << " ProcessedSampleCount=" << ProcessedSampleCount() 
+     << " NS_InFlagged= " << ns_inflagged
      << " NS_OutOfRange= " << ns_outofrange 
+     << " NS_CleanNSig= " << ns_cleannsig << endl 
      << " NS_Flag1(+)= " << ns_flag1p << " NS_Flag2(+)= " << ns_flag2p
      << " NS_Flag1(-)= " << ns_flag1m << " NS_Flag2(-)= " << ns_flag2m << endl;
@@ -131 +137 @@
       double cleanthrmin = range_min;
       double cleanthrmax = range_max;
-      if ((kb > 0) && ( ns_glms > wsize/2) ) {
+      if ((kb > mNbW/2) && ( ns_glms > 3*wsize) ) {
         cleanthrmin = cur_mean-nsigclean*cur_sig;
         cleanthrmax = cur_mean+nsigclean*cur_sig;
@@ -137 +143 @@
       for(j=0; j<wsize; j++) {
         double x = vin(j);
+        if ((vfg(j)&flag_mask)) { ns_inflagged++; continue; }
         if ((x > range_max) || (x < range_min) ) continue;
-        if ((x > cleanthrmax) || (x < cleanthrmin) )  continue;   
+        if ((x > cleanthrmax) || (x < cleanthrmin) )  { 
+          ns_cleannsig++;
+          continue;       
+        }   
         sum += x;  sum2 += x*x;   nok++;
       }
@@ -295 +305 @@
       if (fgout)  for(j=0; j<wsize; j++) { 
         double x = vinc(j);
+        if ((vfgc(j)&flag_mask))  ns_inflagged++; 
         if ((x > range_max) || (x < range_min) ) {
           ns_outofrange++; vfgc(j) |= FlgToiOut;

trunk/ArchTOIPipe/ProcWSophya/simcleaner.h

@@ -40 +40 @@
   inline void   GetRange(double& min, double& max) const 
     { min = range_min; max = range_max; }
-  inline void   SetCleanForMeanThrNSig(double ns=3.)
+  inline void   SetFlagMask(uint_8 mask = 0)  // Aucun flag utilise par defaut
+    { flag_mask = mask; }
+  inline uint_8 GetFlagMask() { return flag_mask; }
+
+  inline void   SetCleanForMeanThrNSig(double ns=5.)
     { nsigclean = ns; }
   inline double GetCleanForMeanThrNSig()
@@ -75 +79 @@
   int min_npt2;       // Min NPoints a += nsig2 
   double range_min, range_max;  // Range acceptable pour in
+  uint_8 flag_mask;     // mask de flag utilise
+  int_4 ns_inflagged;     // Nb d'echantillons flagges
+
   int_4 ns_outofrange;  // Nb de points out of range
+  int_4 ns_cleannsig;   // Nb de points nettoyes a +/- nsigclean 
   int_4 ns_flag1p;       // Nb de points flagges avec nsig1 (> mean) 
   int_4 ns_flag2p;       // Nb de points flagges avec nsig2 (> mean)

trunk/ArchTOIPipe/ProcWSophya/toi2map.cc

@@ -3 +3 @@
 //                               Christophe Magneville
 //                               Reza Ansari
-// $Id: toi2map.cc,v 1.25 2002-05-16 20:39:52 ansari Exp $
+// $Id: toi2map.cc,v 1.26 2002-06-11 17:14:25 ansari Exp $
 
 #include "machdefs.h"
@@ -194 +194 @@
 
   int_4 ipix = mMap->PixIndexSph(theta,phi);
+  if ((ipix < 0) || (ipix >= mMap->NbPixels()) ) continue;
   (*mMap)(ipix) += bolo;    
   ((*mWMap)(ipix)) += 1;