Changeset 4010 in Sophya

Timestamp:

Jun 29, 2011, 8:28:19 PM (13 years ago)

Author:

ansari

Message:

MAJ et adaptation (sauvegarde visibilites en FITS) prog acq pour tests correlateur soft FAN a Nancay debut juillet Reza 29/06/2011

Location:

trunk/AddOn/TAcq

Files:

• acqparam_exemple.d (modified) (2 diffs)
• bracqvers.h (modified) (1 diff)
• brparam.cc (modified) (5 diffs)
• brparam.h (modified) (1 diff)
• mfacq.cc (modified) (2 diffs)

trunk/AddOn/TAcq/acqparam_exemple.d

@@ -47 +47 @@
 #                    [ordfft2c : fft 2 channels with software reordering]
 #                    [fftshrink=fft2cshrink : FFT 2 chan firmware with shrink - 250/4 MHz]
-#                    [hdcorrel : data from FPGA / F.Deschamps correlator ]
+#                    [hdcorrel : data from FPGA / F.DfgfitsVisiCeschamps correlator ]
 #   Autres modes:  raw1c , fft1c , fft1cshrink ,  , ordfft1c  
 #                  [nof=std+NoFitsFile] pattern,patnof,fft2cnof ...
@@ -128 +128 @@
 #  Defaut: visifreq 0 0 0   (aucun binning, toutes les frequences) 
 visifreq 0 0 0
+##  Choix format fichiers de sortie pour les visibilites 
+#  @visifitsout  OU @visippfout   - defaut PPF 
+visifitsout
 ########################
 #  Taux de perte de paquets en simulation / nombre maxi de paquets generes (Sans carte PCIExpress) 

trunk/AddOn/TAcq/bracqvers.h

@@ -5 +5 @@
    Software version     LAL - 2008-2010 
 */
-#define BAOR_ACQ_VER 7.4
-#define BAOR_ACQ_VER_STR "BaoAcq_v7r4_Mar11"
+#define BAOR_ACQ_VER 7.5
+#define BAOR_ACQ_VER_STR "BaoAcq_v7r5_Jun11"
 
 #endif

trunk/AddOn/TAcq/brparam.cc

@@ -212 +212 @@
   freqminVisiC=freqmaxVisiC=0;
   nbinfreqVisiC=1;  
+  fgfitsVisiC=false;
 
 // Autres variables / variables speciales 
@@ -299 +300 @@
   freqmaxVisiC=p.freqmaxVisiC;
   nbinfreqVisiC=p.nbinfreqVisiC; 
+  fgfitsVisiC=p.fgfitsVisiC;
 
   monothr=p.monothr;
@@ -394 +396 @@
     nbinfreqVisiC=conf.IParam("visifreq",2,1);
   }
+  if (conf.HasKey("visifitsout")) fgfitsVisiC=true;
+  if (conf.HasKey("visippfout")) fgfitsVisiC=false;
 
   nopciLossRate=conf.DParam("nopcilossrate",0,0.);
@@ -435 +439 @@
   fgdatafft=false;  fgfftshrink=false;  fgsinglechannel=false;
   reducneedcopy=false;  pqreducmode=BR_TwoChanReduc;
-  if ((acqmode == "std")||(acqmode=="raw2c")||(acqmode=="hdcorrel"))   swapall = BR_Copy ; 
+  if ((acqmode == "std")||(acqmode=="raw2c"))   swapall = BR_Copy ; 
   if (acqmode=="raw1c") { swapall = BR_Copy ;  fgsinglechannel=true;  pqreducmode=BR_OneChanReduc; }
 
@@ -551 +555 @@
     os << " ... VisiCalc FrequencyBinning FreqMin= " << freqminVisiC << " FreqMax= " << freqmaxVisiC 
        << " NBinFreq= " << nbinfreqVisiC<< endl;
+    os << (fgfitsVisiC?" FITS output format for visibility files":" PPF output format for visibility files") << endl;
   }
   os << " fg_hard_ctrlc=" << ((fg_hard_ctrlc)?"true":"false");

trunk/AddOn/TAcq/brparam.h

@@ -212 +212 @@
   bool fgpimpVisiC;    // true -> calcul visibilite pair-impair + autocorrel  
   uint_4 freqminVisiC, freqmaxVisiC, nbinfreqVisiC;  // si zone de frequence/rebinning pour visibilites
-
+  bool fgfitsVisiC;        // true -> sauvegarde des visibilites au format FITS 
    
   // Pour des tests de performances ou sans carte ADC (pattern) 

trunk/AddOn/TAcq/mfacq.cc

@@ -32 +32 @@
   cout << " ============= BAORadio / Acquisition : mfacq  =================" << endl;
   cout << " ===============================================================" << endl;
-  cout << " =========  " <<BAOR_ACQ_VER_STR <<BAOR_ACQ_VER << " ===========" << endl;
+  cout << " =========  " <<BAOR_ACQ_VER_STR << "( V= " << BAOR_ACQ_VER << " ) ===========" << endl;
   cout << " ===============================================================" << endl;
   
@@ -431 +431 @@
   VCGThr.ActivateVisDTable(acpar.fgfdtVisiC);
   VCGThr.SetPrintLevel(acpar.prtlevel_, acpar.prtmodulo2_); 
+  if (acpar.fgfitsVisiC) VCGThr.SetFitsOutput();
 
   cout << "mfacq[3] Creating   EthernetReader thread object     " << endl;