Changeset 3915 in Sophya for trunk/AddOn/TAcq/brparam.cc

Timestamp:

Nov 30, 2010, 10:13:51 PM (15 years ago)

Author:

ansari

Message:

1/ Modification de BRVisibilityCalculator et BRVisCalcGroup pour permettre

la specification de range de visib a calculer (firstPair, NbPairs) et
Visib(Pair-Impair) (Odd-EvenOnly)

2/ Ajout parametres de controle de range de visibilites

datacard @visipairs FirstPair NbPairs [OddEvenOnly]

Reza+cmv 30/11/2010

File:

• trunk/AddOn/TAcq/brparam.cc (modified) (4 diffs)

trunk/AddOn/TAcq/brparam.cc

@@ -205 +205 @@
   nbcalgrpVisiC=1;
   nthrVisiC=1;
+  firstpairVisiC=0;  
+  nbpairsVisiC=999999999;
+  fgpimpVisiC=false;
   freqminVisiC=freqmaxVisiC=0;
   nbinfreqVisiC=1;  
@@ -280 +283 @@
   stepProc=p.stepProc;
   nmaxProc=p.nmaxProc;
+
+  fgdoVisiC=p.fgdoVisiC;           
+  nmeanVisiC=p.nmeanVisiC;         
+  nbcalgrpVisiC=p.nbcalgrpVisiC;     
+  nthrVisiC=p.nthrVisiC;         
+  firstpairVisiC=p.firstpairVisiC;
+  nbpairsVisiC=p.nbpairsVisiC;  
+  fgpimpVisiC=p.fgpimpVisiC;
+  freqminVisiC=p.freqminVisiC;
+  freqmaxVisiC=p.freqmaxVisiC;
+  nbinfreqVisiC=p.nbinfreqVisiC; 
 
   monothr=p.monothr;
@@ -363 +377 @@
     nthrVisiC=conf.IParam("visicalc",2,1);
   }
-  if (conf.HasKey("visicfreq")) {
-    freqminVisiC=conf.IParam("visicfreq",0,0);
-    freqmaxVisiC=conf.IParam("visicfreq",1,0);
-    nbinfreqVisiC=conf.IParam("visicfreq",2,1);
+  if (conf.HasKey("visipairs")) {
+    firstpairVisiC=conf.IParam("visipairs",0,0);
+    nbpairsVisiC=conf.IParam("visipairs",1,999999999);
+    fgpimpVisiC=(conf.IParam("visipairs",2,0)>0)?true:false;
+  }
+  if (conf.HasKey("visifreq")) {
+    freqminVisiC=conf.IParam("visifreq",0,0);
+    freqmaxVisiC=conf.IParam("visifreq",1,0);
+    nbinfreqVisiC=conf.IParam("visifreq",2,1);
   }
 
@@ -512 +531 @@
   if (fgdoVisiC) {
     os << " Visibility calculation, nbCalGrp=" << nbcalgrpVisiC << " NThr/VisCal=" << nthrVisiC << endl;
+    os << " ... VisiCalc FirstPair= " << firstpairVisiC << " NbPairs= " << nbpairsVisiC 
+       << ((fgpimpVisiC)?" (Odd-Even visibilities+AutoCorrel only) ":"") << endl;
     os << " ... VisiCalc FrequencyBinning FreqMin= " << freqminVisiC << " FreqMax= " << freqmaxVisiC 
        << " NBinFreq= " << nbinfreqVisiC<< endl;