Changeset 3938 in Sophya for trunk/AddOn/TAcq/specmfib.cc
- Timestamp:
- Jan 13, 2011, 11:42:21 AM (15 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/AddOn/TAcq/specmfib.cc
r3905 r3938 50 50 if (rc) return rc; 51 51 par.Print(cout); 52 if ((par.action_!="cube3d")&&(par.action_!="mspec") ) {53 cout << " !!! specmfib.cc BAD action = " << par.action_ << " possible values: mspec,cube3d " << endl;52 if ((par.action_!="cube3d")&&(par.action_!="mspec")&&(par.action_!="bproc")) { 53 cout << " !!! specmfib.cc BAD action = " << par.action_ << " possible values: mspec,cube3d,bproc" << endl; 54 54 return 5; 55 55 } … … 74 74 procms.SetVarianceLimits(par.vmin_, par.vmax_); 75 75 if (par.gainfile_.length()>0) procms.ReadGainFitsFile(par.gainfile_); 76 procms.SetPrintLevel(par.prtlevel_,par.prtmodulo_); 77 // Il faut appeler procms.DefineDataTable() si on veut remplir le DataTable 76 78 77 79 BRFFTCalculator procfft(mmgr, par.fgsinglechannel_); … … 83 85 FitsCubeWriter wrt(mmgr, par.outpath_, par.nbloc_); 84 86 87 BRBaseProcessor* bproc_p=NULL; 88 if (par.action_=="bproc") { 89 bproc_p = new BRBaseProcessor(mmgr); 90 bproc_p->SetPrintLevel(par.prtlevel_,par.prtmodulo_); 91 if (!par.fgdatafft_) bproc_p->SetMemZAction(MemZA_ProcB); 92 } 93 85 94 cout << " specmfib: Starting threads (reader meanSpecCalculator ...) ... " << endl; 86 95 reader.start(); … … 88 97 else { // Calcul spectre moyenne 89 98 if (!par.fgdatafft_) procfft.start(); 90 procms.start(); 99 if (par.action_=="bproc") bproc_p->start(); 100 else procms.start(); 91 101 } 92 102 usleep(200000); … … 95 105 else { 96 106 if (!par.fgdatafft_) procfft.join(); 97 procms.join(); 107 if (par.action_=="bproc") bproc_p->join(); 108 else procms.join(); 98 109 } 99 110 mmgr.Print(cout); 111 if (bproc_p) delete bproc_p; 100 112 cout << resu ; 101 113 }
Note:
See TracChangeset
for help on using the changeset viewer.