Changeset 3672 in Sophya for trunk/AddOn/TAcq/racqurw.cc

Timestamp:

Nov 13, 2009, 6:39:58 PM (16 years ago)

Author:

ansari

Message:

Corrections diverses - mfacq.cc OK, Reza

File:

• trunk/AddOn/TAcq/racqurw.cc (modified) (8 diffs)

trunk/AddOn/TAcq/racqurw.cc

@@ -332 +332 @@
 //----------------------------------------------------------------------------------------------------------
 
-PCIEReaderChecker::PCIEReaderChecker(PCIEWrapperInterface &pciw,uint_4 sizeFrame,uint_4 packSize ,RAcqMemZoneMgr& mem, 
-                                     uint_4 nmax, BRDataFmtConv swapall)
+PCIEReaderChecker::PCIEReaderChecker(PCIEWrapperInterface &pciw, uint_4 sizeFrame,uint_4 packSize, RAcqMemZoneMgr& mem, 
+                                     uint_4 nmax, BRDataFmtConv swapall) 
   :   memgr(mem) , pciw_ (pciw)
 {
@@ -464 +464 @@
 
 /* --Methode-- */
-PCIEMultiReader::PCIEMultiReader(vector<PCIEWrapperInterface*> vec_pciw,uint_4 sizeFrame,uint_4 packSize ,RAcqMemZoneMgr& mem, uint_4 nmax, BRDataFmtConv swapall)
-  :   memgr(mem) , vec_pciw_ (vec_pciw)
-{
-  nmax_ = nmax; 
-  swapall_ = swapall;   // select data swap/format conversion for BRPaquet
+PCIEMultiReader::PCIEMultiReader(vector<PCIEWrapperInterface*> vec_pciw, RAcqMemZoneMgr& mem, BRParList const& par)
+  :   memgr(mem), par_(par), vec_pciw_ (vec_pciw)
+{
+  nmax_ = par_.MaxNbBlocs();    
+  swapall_ = par_.GetDataConvFg();      // select data swap/format conversion for BRPaquet
   stop_ = false;
-  packSize_ = packSize;
+  packSize_ = par_.RecvPaquetSize();
   packSizeInMgr_=memgr.PaqSize();
-  sizeFr_ =sizeFrame;
+  sizeFr_=par_.DMASizeBytes();
   if (vec_pciw.size() != memgr.NbFibres()) {
     cout << " PCIEMultiReader()PbArgs: vec_pciw.size()= " << vec_pciw.size() << " memgr.NbFibres()=" <<memgr.NbFibres()<< endl;
@@ -688 +688 @@
 //--------------------------------------------------------------------
 
-MultiDataSaver::MultiDataSaver(RAcqMemZoneMgr& mem, string path, uint_4 nfiles, uint_4 nblocperfile, bool savesig)
+/* --Methode-- */
+MultiDataSaver::MultiDataSaver(RAcqMemZoneMgr& mem)
   :  memgr(mem)
-{
-  nfiles_ = nfiles;
-  nblocperfile_ = nblocperfile;
+{  
+  BRAcqConfig bpar;
+  nfiles_ = bpar.MaxNbFiles();
+  nblocperfile_ = bpar.BlocPerFile();
   nmax_ = nblocperfile_*nfiles_;
-  savesig_ = savesig;  // Si false, pas d'ecriture des fichiers FITS du signal  
+  savesig_ = bpar.GetSaveFits();  // Si false, pas d'ecriture des fichiers FITS du signal       
   stop_ = false;        
-  path_ = path; 
-}
+}
+
+/* --Methode-- */
 void MultiDataSaver::Stop()
 {
   // cout<< " MultiDataSaver:Stop ........ " << endl;
   stop_=true;
-
-}
+}
+
+/* --Methode-- */
 void MultiDataSaver::run()
 {
@@ -715 +719 @@
     char fname[512];
 
-    sprintf(fname,"%s/msaver.log",path_.c_str());
+    sprintf(fname,"%s/msaver.log",bpar.OutputDirectory().c_str());
     ofstream filog(fname);
     filog << " MultiDataSaver::run() - starting log file " << ts << " NFibres= " << memgr.NbFibres() << endl;                  
@@ -727 +731 @@
     uint_4 paqsz = memgr.PaqSize();
     cout << " ============================ MultiDataSaver::run() PaqSize " << paqsz <<endl;
-    bool fgnulldev = false;
-    if (path_ == "/dev/null") { 
+    bool fgnulldev = bpar.GetFileDevNull(); 
+    if (fgnulldev) { 
       cout << " MultiDataSaver::run()/Warning /dev/null path specified, filenames=/dev/null" << endl;
       fgnulldev = true;
@@ -740 +744 @@
         for(uint_4 fib=0; fib<memgr.NbFibres(); fib++) {
           if (fgnulldev) strcpy(fname,"/dev/null");
-          else sprintf(fname,"%s/Fibre%d/HDRfits%d.txt",path_.c_str(),fib+1,fnum);
+          else sprintf(fname,"%sHDRfits%d.txt",bpar.OutputDirectoryFib(fib).c_str(),fnum);
           header[fib].open(fname);
         }
@@ -749 +753 @@
         for(uint_4 fib=0; fib<memgr.NbFibres(); fib++)    {
           if (fgnulldev) strcpy(fname,"/dev/null");
-          else sprintf(fname,"%s/Fibre%d/signal%d.fits",path_.c_str(),fib+1,(int)fnum);
+          else sprintf(fname,"%ssignal%d.fits",bpar.OutputDirectoryFib(fib).c_str(),(int)fnum);
+          //      cout << " ***DBG** Opening file " << fname << endl;
           mff[fib].Open(fname,MF_Write);  //Reza - Ouverture conditionnel fichier 
           // Entete correspondant a l'ecriture tout le paquet - trailer compris (modif Mai 2009)
@@ -797 +802 @@
         if (savesig_) {
           if (fgnulldev) strcpy(fname,"/dev/null");
-          else sprintf(fname,"%s/Fibre%d/signal%d.fits",path_.c_str(),fib+1,(int)fnum-1);
+          else sprintf(fname,"%ssignal%d.fits",bpar.OutputDirectoryFib(fib).c_str(),(int)fnum);
         }
         else sprintf(fname,"MemDataBloc[%d]-NoDataFile",(int)fnum-1);