Forgot to update the prototypes

XAMS-nikhef · Jun 30, 2021 · 2883c8a · 2883c8a
1 parent 91d39b4
commit 2883c8a
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/DAQController.cc b/DAQController.cc
@@ -61,7 +61,7 @@ int DAQController::Arm(std::shared_ptr<Options>& options){
         digi = std::make_shared<f1724>(fLog, fOptions, d.board, 0);
       else
         digi = std::make_shared<V1724>(fLog, fOptions, d.board, d.vme_address);
-      if (digi->Init(d.link, d.crate, fOptions))
+      if (digi->Init(d.link, d.crate))
         throw std::runtime_error("Board init failed");
       fDigitizers[d.link].emplace_back(digi);
       num_boards++;

diff --git a/V1724.hh b/V1724.hh
@@ -19,7 +19,7 @@ class V1724{
   V1724(std::shared_ptr<MongoLog>&, std::shared_ptr<Options>&, int, unsigned=0);
   virtual ~V1724();
 
-  virtual int Init(int, int, std::shared_ptr<Options>&);
+  virtual int Init(int, int);
   virtual int Read(std::unique_ptr<data_packet>&);
   virtual int WriteRegister(unsigned int, uint32_t);
   virtual unsigned int ReadRegister(unsigned int);

diff --git a/f1724.cc b/f1724.cc
@@ -66,8 +66,8 @@ f1724::~f1724() {
   End();
 }
 
-int f1724::Init(int, int, std::shared_ptr<Options>& opts) {
-  if (opts->GetFaxOptions(fFaxOptions)) {
+int f1724::Init(int, int) {
+  if (fOptions->GetFaxOptions(fFaxOptions)) {
     return -1;
   }
   fGen = std::mt19937_64(fRD());

diff --git a/f1724.hh b/f1724.hh
@@ -14,7 +14,7 @@ public:
   f1724(std::shared_ptr<MongoLog>&, std::shared_ptr<Options>&, int, unsigned);
   virtual ~f1724();
 
-  virtual int Init(int, int, std::shared_ptr<Options>&);
+  virtual int Init(int, int);
   virtual int Read(std::unique_ptr<data_packet>&);
   virtual int WriteRegister(unsigned, unsigned);
   virtual unsigned ReadRegister(unsigned);