Changeset 3943 in Sophya for trunk/AddOn/TAcq/specmfib.cc

Timestamp:

Feb 1, 2011, 9:30:20 AM (15 years ago)

Author:

campagne

Message:

release.txt

File:

• trunk/AddOn/TAcq/specmfib.cc (modified) (5 diffs)

trunk/AddOn/TAcq/specmfib.cc

@@ -26 +26 @@
 #include "brfitsrd.h"
 #include "brproc.h"
+
+//JEC 19/1/11 START
+#include "brprocGain.h"
+//JEC END
+
 #include "brdiskw.h"
 
@@ -50 +55 @@
     if (rc) return rc;
     par.Print(cout);
-    if ((par.action_!="cube3d")&&(par.action_!="mspec")&&(par.action_!="bproc")) {
+    if ((par.action_!="cube3d")
+        &&(par.action_!="mspec")
+        &&(par.action_!="gain") //JEC 19/1/11 add gain action
+        &&(par.action_!="bproc") 
+        ) {
       cout << " !!! specmfib.cc  BAD action = " << par.action_ << " possible values: mspec,cube3d,bproc" << endl;
       return 5;
@@ -73 +82 @@
     BRMeanSpecCalculator procms(mmgr, par.outpath_, par.nmean_, par.fgdatafft_, par.fgsinglechannel_);
     procms.SetVarianceLimits(par.vmin_, par.vmax_);
-    if (par.gainfile_.length()>0) procms.ReadGainFitsFile(par.gainfile_);
+    if (par.nbands_>0) procms.SetNumberOfBands(par.nbands_,par.bandfirst_,par.bandlast_);
+    //JEC 27/1/11 see below    if (par.gainfile_.length()>0) procms.ReadGainFitsFile(par.gainfile_);
     procms.SetPrintLevel(par.prtlevel_,par.prtmodulo_);
-    // Il faut appeler procms.DefineDataTable() si on veut remplir le DataTable
+    if (par.fgdt_) procms.DefineDataTable();
+
+    BRGainCalculator* procgain_p=NULL;
+    if (par.action_=="gain") {
+      procgain_p = 
+        new BRGainCalculator(mmgr, par.outpath_, par.nmean_, par.fgdatafft_, par.fgsinglechannel_);
+      procgain_p->SetPrintLevel(par.prtlevel_,par.prtmodulo_);
+    }
+
 
     BRFFTCalculator procfft(mmgr, par.fgsinglechannel_);
-    if (!par.fgdatafft_) procms.SetMemZAction(MemZA_ProcB);
+    if (!par.fgdatafft_) { 
+      procms.SetMemZAction(MemZA_ProcB);
+      if(procgain_p) procgain_p->SetMemZAction(MemZA_ProcB);
+    }
+
     if (par.spec_win_sz_>0) { 
       procms.SetSpectraWindowSize(par.spec_win_sz_, par.spw_ext_sz_);
-      procms.SetMaxNbSepcWinFiles(par.nbmax_specwfiles_);
+      procms.SetMaxNbSpecWinFiles(par.nbmax_specwfiles_);
+      if(procgain_p){
+        procgain_p->SetSpectraWindowSize(par.spec_win_sz_, par.spw_ext_sz_);
+        procgain_p->SetMaxNbSpecWinFiles(par.nbmax_specwfiles_);
+      }
     }
+    //JEC 27/1/11 should be done after SetSpectraWindowSize to perform x-checking
+    if (par.gainfile_.length()>0) procms.ReadGainFitsFile(par.gainfile_);
+
     FitsCubeWriter wrt(mmgr, par.outpath_, par.nbloc_);
 
@@ -92 +121 @@
     }
 
-    cout << " specmfib: Starting threads (reader meanSpecCalculator ...) ... " << endl;
+    cout << " specmfib: Starting threads (reader + "<< par.action_ << ")" << endl;
     reader.start();
     if (par.action_ == "cube3d")   wrt.start();
     else {  // Calcul spectre moyenne 
       if (!par.fgdatafft_)  procfft.start(); 
+      //JEC 19/1/11 START add the gain process alternative
       if (par.action_=="bproc")  bproc_p->start();
+      else if (par.action_=="gain") procgain_p->start();
       else procms.start();
+      //JEC END
     }
     usleep(200000);
@@ -105 +137 @@
     else {
       if (!par.fgdatafft_)  procfft.join(); 
+
+      //JEC 19/1/11 START add the gain process alternative
       if (par.action_=="bproc")  bproc_p->join();
+      else if (par.action_=="gain") procgain_p->join();
       else procms.join();
+      //JEC END
     }
     mmgr.Print(cout);
     if (bproc_p) delete bproc_p;
+    if (procgain_p) delete procgain_p;
     cout << resu ; 
   }