Changeset 3913 in Sophya for trunk/AddOn/TAcq/mfacq.cc

Timestamp:

Nov 26, 2010, 2:45:39 PM (15 years ago)

Author:

ansari

Message:

1/ Correction de gestion de changement de timeout DMA ( racqueth.cc , racqurw.cc)
2/ Amelioration de la gestion des arguments de ligne de commande et

datacard - introduction de variables d'environnement
BRACQ_TMPDIR TMPDIR BRACQ_BASEDIR BRACQ_FIBERIDS

3/ possibilite de specifier des cibles ethernet pour chaque fibre

Reza 26/11/2010

File:

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

trunk/AddOn/TAcq/mfacq.cc

@@ -53 +53 @@
   
   const char* desact[4] = {"PCIE_To_Ethernet", "Ethernet_To_Disk", "Ethernet_To_Visibilities","PCIE_DMA_To_Disk"};
-  string action=arg[1];
-  int act = 0;
-  if ((action != "-pci2eth")&&(action != "-pci2disk")&&(action != "-eth2disk")&&(action != "-eth2visib")) {
-    cout << " mfacq/Error , Bad action argument : " << action << endl;
-    return 2;
-  }
-  if (action == "-pci2eth")  act=0;
-  else if (action == "-eth2disk") act=1;  
-  else if (action == "-eth2visib") act=2; 
-  else if (action == "-pci2disk")  act=3;
-
-  string pardcfile=arg[2];
-#ifndef NOPCIECARD  
-  string basedir="/Raid";
-#else 
-  string basedir="./";
-#endif 
-  vector<string> oargs;
-  if (narg>3)  {
-    basedir=arg[2];
-    for(int jj=3; jj<narg; jj++)  oargs.push_back(arg[jj]);
-  }
   try {
     // Creation/initialisation parametres Acq
-    BRAcqConfig acpar;
-    acpar.ReadParamFile(pardcfile);
-    acpar.GetConfig().SetBaseDirectory(basedir); 
-    if ((act==0)&&(oargs.size()>0))
-      acpar.GetParams().SetEthTargets(oargs);
-    // Creation des repertoires 
-    if (act > 0) 
-      if (acpar.CreateOutputDirectories()!=0)  return 9;
-    acpar.GetParams().fgdoVisiC=false;
-    if (act == 2)  acpar.GetParams().fgdoVisiC=true;
-
-    acpar.Print(cout);
-    struct sigaction siact;  
-    if (!acpar.GetParams().fg_hard_ctrlc) {
-      siact.sa_handler=Stop;
-      sigaction(SIGINT,&siact,NULL);        
+    int act = DecodeArgs(narg,arg);
+    if ((act < 0)||(act>3))  { 
+      cout << "mfacq/ERROR decoding arguments act=" << act << " -> exit -5" << endl;
+      return -5;
     }
+    cout << " mfacq/INFO action: " << desact[act] << endl; 
     switch (act) {
     case 0:
@@ -139 +106 @@
 void Usage(bool fgshort) 
 {
-  cout << " Usage: mfacq Action DataCardFile [BaseDirectory / TargetMachines]" << endl;
+  cout << " Usage: mfacq Action DataCardFileName [-dc DataCard -dc DataCard] [TargetMachines]" << endl;
   if (fgshort) return;
   cout << " o Action = -pci2disk , -pci2eth , -eth2disk , -eth2visib \n " 
@@ -145 +112 @@
        << "     fibres outpathname skysource paqsize dmasizekb nbfiles \n" 
        << "     nblocperfile acqmode memmgr monitor reducpaqsz ... "<< endl;
-  cout << " o BaseDirectory (default= /Raid ) for -pci2disk , -eth2disk" << endl;
+  cout << " o -dc DataCard : datacard appended for DataCardFileName" << endl;
   cout << " o TargetMachines : List of target machines for PCIe2Ethernet (-pci2eth) \n " << endl;
   return;
 }
- 
+
+/* --Nouvelle-Fonction-- */
+int DecodeArgs(int narg, char* arg[])
+{
+  string action=arg[1];
+  int act = 0;
+  if ((action != "-pci2eth")&&(action != "-pci2disk")&&(action != "-eth2disk")&&(action != "-eth2visib")) {
+    cout << " mfacq/Error , Bad action argument : " << action << endl;
+    return -2;
+  }
+  if (action == "-pci2eth")  act=0;
+  else if (action == "-eth2disk") act=1;  
+  else if (action == "-eth2visib") act=2; 
+  else if (action == "-pci2disk")  act=3;
+
+  BRAcqConfig acpar;
+  char tmpdcname[128];
+  sprintf(tmpdcname,"%s/dc_XXXXXX",acpar.TmpDirectory().c_str());
+  mktemp(tmpdcname);
+  string dcardfile=tmpdcname;
+  dcardfile+=".d";
+  string pardcfile=arg[2];
+  char cmd[512];
+  sprintf(cmd,"cp %s %s",pardcfile.c_str(),dcardfile.c_str());
+  cout << " mfacq/DecodeArgs() executing command: " << cmd << endl;
+  int rc;
+  rc=system(cmd);
+  if (rc!=0) { 
+    cout << " mfacq/ERROR system(cmd) , Rc=" << rc << endl;
+    return -3;
+  }
+  
+  vector<string> oargs;
+  int aoff=3;
+  {
+    ofstream dcf( dcardfile.c_str(), ios_base::out|ios_base::app);
+    dcf << "#### Appended datacards from command line " << endl;
+    while (aoff<(narg-1)) {
+      if (strcmp(arg[aoff],"-dc") != 0) break;
+      dcf << arg[aoff+1] << endl;
+    }
+    if ((act==0)&&(aoff<narg)) {  // default ethernet target destinations 
+      dcf << "@ethrtargets  ";
+      for(int jj=aoff; jj<narg; jj++)  dcf << arg[jj] << " ";
+      dcf << endl;
+    }
+  }
+
+  acpar.GetParams().fgdoVisiC=false;
+  if (act == 2)  acpar.GetParams().fgdoVisiC=true;
+  
+  acpar.ReadParamFile(dcardfile);
+  acpar.CreateOutputDirectories();
+
+  sprintf(cmd,"cp %s %s/acqparm.d",dcardfile.c_str(),acpar.OutputDirectory().c_str());
+  cout << " mfacq/DecodeArgs() executing command: " << cmd << endl;
+  rc=system(cmd);
+  if (rc!=0) { 
+    cout << " mfacq/ERROR system(cmd) , Rc=" << rc << endl;
+    return -3;
+  }
+
+  acpar.Print(cout);
+  string pflnm=acpar.OutputDirectory();
+  pflnm+="/params.log";
+  ofstream pfile(pflnm.c_str());
+  acpar.Print(pfile);
+
+  struct sigaction siact;  
+  if (!acpar.GetParams().fg_hard_ctrlc) {
+    siact.sa_handler=Stop;
+    sigaction(SIGINT,&siact,NULL);        
+  }
+
+  return act;
+}
  
 /* --Nouvelle-Fonction-- */
@@ -210 +252 @@
   vector<PCIEWrapperInterface*> vec_pciw;
   for  (size_t i=0 ;i<bpar.NFibers();i++)  {
-    pciwp[i]->SetFiberNumId(acpar.FiberNum[i], acpar.FiberIds[i]);
+    pciwp[i]->SetFiberNumId(bpar.FiberNum(i), bpar.FiberId(i));
     vec_pciw.push_back( pciwp[i]);
     //    cout << " mfacq[3.b]/Debug - pciwp[" << i << "] " << hex << pciwp[i] << dec << endl;
@@ -299 +341 @@
   vector<PCIEWrapperInterface*> vec_pciw;
   for  (size_t i=0 ;i<bpar.NFibers();i++)  { 
-    pciwp[i]->SetFiberNumId(acpar.FiberNum[i], acpar.FiberIds[i]);
+    pciwp[i]->SetFiberNumId(bpar.FiberNum(i), bpar.FiberId(i));
     vec_pciw.push_back( pciwp[i]);
   }
@@ -329 +371 @@
 }
 
-
-/* Fonction-Utilitaire : Voir en fin de fichier  */
-MemZaction ConvertMemZ_Status2Action( MemZStatus st );
 
 /* --Nouvelle-Fonction-- */
@@ -385 +424 @@
   string ppath=bpar.OutputDirectory();
   MonitorProc PrThr(mmgr);
-  PrThr.SetMemZAction( ConvertMemZ_Status2Action( mskmon ) );
+  PrThr.SetMemZAction( RAcqMemZoneMgr::Convert_Status2Action( mskmon ) );
   BRVisCalcGroup VCGThr(acpar.nbcalgrpVisiC, mmgr, bpar.OutputDirectory(), acpar.nmeanVisiC, acpar.nthrVisiC);
   VCGThr.SelectFreqBinning(acpar.freqminVisiC, acpar.freqmaxVisiC, acpar.nbinfreqVisiC);
@@ -436 +475 @@
 
 
-/* --Nouvelle-Fonction-Utilitaire */
-MemZaction ConvertMemZ_Status2Action( MemZStatus st )
-{
-  MemZaction ra=MemZA_None;
-  switch (st) {
-  case MemZS_Filled:
-    ra=MemZA_Fill;
-    break;
-  case MemZS_Saved:
-    ra=MemZA_Save;
-    break;
-  case MemZS_Proc:
-    ra=MemZA_Proc;
-    break;
-  case MemZS_ProcA:
-    ra=MemZA_ProcA;
-    break;
-  case MemZS_ProcB:
-    ra=MemZA_ProcB;
-    break;
-  case MemZS_ProcC:
-    ra=MemZA_ProcC;
-    break;
-  case MemZS_ProcD:
-    ra=MemZA_ProcD;
-    break;
-  case MemZS_ProcE:
-    ra=MemZA_ProcE;
-    break;
-  case MemZS_ProcF:
-    ra=MemZA_ProcF;
-    break;
-  default:
-    ra=MemZA_None;
-    break;
-  }
-  return ra;
-}