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

Timestamp:

Dec 2, 2010, 4:41:13 PM (15 years ago)

Author:

ansari

Message:

Amelioration code thread monitoring pour tenir compte du mode fftshrink + calcul matrice saturation, cmv+Reza

File:

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

trunk/AddOn/TAcq/brparam.cc

@@ -154 +154 @@
   AcqMode=acqmod;
   fgdatafft=false;
+  fgfftshrink=false;
   fgsinglechannel=false;
 
@@ -233 +234 @@
   AcqMode=p.AcqMode;
   fgdatafft=p.fgdatafft;
+  fgfftshrink=p.fgfftshrink;
   fgsinglechannel=p.fgsinglechannel;
 
@@ -425 +427 @@
   }
   string acqmode = AcqMode;
-  fgdatafft=false;  fgsinglechannel=false;
+  fgdatafft=false;  fgfftshrink=false;  fgsinglechannel=false;
   reducneedcopy=false;  pqreducmode=BR_TwoChanReduc;
   if ((acqmode == "std")||(acqmode=="raw2c"))   swapall = BR_Copy ; 
   if (acqmode=="raw1c") { swapall = BR_Copy ;  fgsinglechannel=true;  pqreducmode=BR_OneChanReduc; }
 
-  if ((acqmode == "fft2c")||(acqmode == "fft1c"))   swapall = BR_Copy ;  
+  if (acqmode=="fft2c")  { swapall = BR_Copy;  fgdatafft=true; } 
+  if ((acqmode=="fft2cshrink")||(acqmode=="fftshrink"))  {  swapall = BR_Copy; fgdatafft=true; fgfftshrink=true; } 
+  if (acqmode=="fft1c")  { swapall = BR_Copy;  fgdatafft=true; fgsinglechannel=true; } 
+  if (acqmode=="fft1cshrink")  {  swapall = BR_Copy; fgdatafft=true; fgfftshrink=true; fgfftshrink=true; } 
+
   if (acqmode == "nosw")   swapall = BR_Copy ;
   if (acqmode == "nof")  { swapall = BR_Copy ; savesigfits = false; }
@@ -497 +503 @@
   os << " AcqMode="<<AcqMode;
   os << " Type of acquisition :" << BRPaquet::FmtConvToString( swapall) << endl;
+  os << " Firmware: " << ((fgdatafft)?" FFT_Data ":" RawData ");
+  os << ((fgfftshrink)?" ShrinkFFT ":" FULLFFT ");
+  os << ((fgsinglechannel)?" SingleChannel":" TwoChannels") << endl;
   os << " SkySource=" << skysource;
   os << " NbFiles="<<NbFiles;