Changeset 3672 in Sophya for trunk/AddOn/TAcq/mfacq.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/mfacq.cc (modified) (3 diffs)

trunk/AddOn/TAcq/mfacq.cc

@@ -49 +49 @@
     // Creation/initialisation parametres Acq
     BRAcqConfig acpar;
-    acpar.ReadDCFile(arg[1]);
+    acpar.ReadParamFile(arg[1]);
+#ifndef NOPCIECARD  
+    BRConfList conf("/Raid"); 
+#else
+    BRConfList conf("./"); 
+#endif
+    acpar.Set(conf);
     // Creation des repertoires 
     if (acpar.CreateOutputDirectories()!=0)  return 9;
@@ -139 +145 @@
 
   cout <<"mfacq[3] Creating DataSaver and DataProc2C objects ... " << endl;
-  MultiDataSaver DsThr(mmgr, bpar.OutputDirectory(), bpar.MaxNbFiles(), 
-                       bpar.BlocPerFile(), bpar.GetSaveFits());
+  MultiDataSaver DsThr(mmgr);   //   Utilise les parametres globaux BRAcqConfig
   string ppath=bpar.OutputDirectory();
   DataProc2C PrThr(mmgr, ppath, 1280, stepproc, acpar.NMaxProc);
@@ -146 +151 @@
   for  (int i=0 ;i<bpar.NFibers();i++)  vec_pciw.push_back( pciwp[i]);
   cout << "mfacq[3] Creating   PCIEMultiReader       " << endl;
-  PCIEMultiReader PcierThr(vec_pciw,bpar.DMASizeBytes(),bpar.RecvPaquetSize(),
-                           mmgr, bpar.MaxNbBlocs(), bpar.GetDataConvFg());
+  PCIEMultiReader PcierThr(vec_pciw, mmgr, bpar.GetParams());
   usleep(200);  // attente au cas ou ...
   pPcierThr=&PcierThr;