Changeset 3672 in Sophya for trunk/AddOn/TAcq/brparam.h

Timestamp:

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

Author:

ansari

Message:

Corrections diverses - mfacq.cc OK, Reza

File:

• trunk/AddOn/TAcq/brparam.h (modified) (6 diffs)

trunk/AddOn/TAcq/brparam.h

@@ -8 +8 @@
 
 //---------------------------------------------------------------
-//  Classes BRParList , BRConfList , BRAcqConfig 
-//  BRParList : Liste de parametres pour un run d'acquisition 
-//  BRConfList : Liste des parametres caracterisant une configuration 
+//  Classes ADCBoardDesc , BRParList , BRConfList , BRAcqConfig 
+//  + ADCBoardDesc : Description d'une carte ADC
+//  + BRParList : Liste de parametres pour un run d'acquisition 
+//  + BRConfList : Liste des parametres caracterisant une configuration 
 //       (nombre de cartes, versions firwares ...) 
-//  BRAcqConfig : Classe donnant acces a un objet global BRParList et 
+//  + BRAcqConfig : Classe donnant acces a un objet global BRParList et 
 //         un objet global BRConfList
 //---------------------------------------------------------------
@@ -18 +19 @@
 #include "machdefs.h"
 #include <string>
+#include <vector>
+#include <iostream>
 #include "brpaqu.h"
 #include "datacards.h"
@@ -24 +27 @@
 using namespace std;
 using namespace SOPHYA;
+
+//-----------------------------------------------------------------------------
+//---- Classe Caracterisant un board ADC 
+class ADCBoardDesc {
+public:
+  ADCBoardDesc(int id, string sbid, string cyc_firmw, string str1_firmw, string str2_firmw);
+  ADCBoardDesc(ADCBoardDesc const& bdes);
+
+  inline int& getId() { return id_; } 
+  inline string& getSId() { return sbid_; }
+  inline string& CycloneFirmwareId() { return cyclone_firmware_; }
+  inline string& Stratix1FirmwareId() { return stratix1_firmware_; }
+  inline string& Stratix2FirmwareId() { return stratix2_firmware_; }
+  ostream& Print(ostream& os);
+
+  ADCBoardDesc& Set(ADCBoardDesc const & bdes);
+  inline ADCBoardDesc& operator = (ADCBoardDesc const & bdes) { return Set(bdes); }
+protected:
+  int id_;
+  string sbid_;
+  string cyclone_firmware_;
+  string stratix1_firmware_;
+  string stratix2_firmware_;  
+};
+
+//-----------------------------------------------------------------------------
+//---- Classe de liste des parametres de configuration BAORadio
+class BRConfList {
+public:
+  BRConfList();
+  BRConfList(string basedir);
+  BRConfList(string basedir, vector<ADCBoardDesc> boards);
+  BRConfList(BRConfList const & cf);
+  void Set(BRConfList const & cf);
+  ostream& Print(ostream& os) ;
+  void ReadDCFile(string file);
+  inline string& BaseDirectory() { return basedir_; }
+//.......................................
+  string basedir_;
+  vector<ADCBoardDesc> boards_;
+};
 
 #define PMAXNBFIBRES 6
@@ -110 +154 @@
   BRAcqConfig();
 
-  inline void ReadDCFile(string file) 
+  inline void ReadParamFile(string file) 
     { param_->ReadDCFile(file); }
   inline void Set(BRParList& par)
     { param_->Set(par); }
-  inline ostream& Print(ostream& os) 
-    { return param_->Print(os); }
+  inline void ReadConfigFile(string file) 
+    { config_->ReadDCFile(file); }
+  inline void Set(BRConfList& conf)
+    { config_->Set(conf); }
+
+  ostream& Print(ostream& os);
 
   int CreateOutputDirectories();
@@ -121 +169 @@
   static inline double AcqVersion()  { return BAOR_ACQ_VER ; }
   static inline const char* AcqVersionS() { return BAOR_ACQ_VER_STR ; } 
- 
+
   inline BRParList&  GetParams() { return (*param_) ;};
+  inline BRConfList&  GetConfig() { return (*config_) ;};
+  
   inline BRDataFmtConv GetSwapall() { return param_->swapall; };
   inline bool GetPattern() { return param_->activate_pattern; };
@@ -150 +200 @@
 
   // repertoire d'acquisition 
-  inline string& OutputDirectory() { param_->OutPathName; }
+  inline string OutputDirectory() { return (config_->BaseDirectory()+param_->OutPathName); }
   string OutputDirectoryFib(int fib);
 
  protected:
   static BRParList* param_;
+  static BRConfList* config_;
 };