Added override to set collection option

Author: coderdj

DAQController.cc

@@ -39,11 +39,17 @@ std::string DAQController::run_mode(){
   }
 }
 
-int DAQController::InitializeElectronics(std::string opts){
+int DAQController::InitializeElectronics(std::string opts, std::string override){
 
+  // Load options including override if any
   if(fOptions != NULL)
     delete fOptions;
   fOptions = new Options(opts);
+  if(override!=""){
+    fOptions->Override(bsoncxx::from_json(override).view());
+  }
+
+  // Initialize digitizers
   fStatus = 1;
   for(auto d : fOptions->GetBoards("V1724")){
 
@@ -63,6 +69,7 @@ int DAQController::InitializeElectronics(std::string opts){
     }
   }
 
+  // Load registers into digitizers
   for(auto digi : fDigitizers){
     int success=0;
     for(auto regi : fOptions->GetRegisters(digi->bid())){
@@ -77,9 +84,14 @@ int DAQController::InitializeElectronics(std::string opts){
       return -1;
     }
   }
+
+  // Look at this later! This initializes all boards to SW controlled
+  // and inactive. Will need option for HW control.
   for(unsigned int x=0;x<fDigitizers.size();x++)
     fDigitizers[x]->WriteRegister(0x8100, 0x0);
   fStatus = 2;
+
+  std::cout<<fOptions->ExportToString()<<std::endl;
   return 0;
 }
 

DAQController.hh

@@ -25,7 +25,7 @@ public:
   DAQController(MongoLog *log=NULL);
   ~DAQController();
 
-  int InitializeElectronics(string opts);
+  int InitializeElectronics(std::string opts, std::string override = "");
 
   // Get data (return new buffer and size)
   double data_rate(){

Options.cc

@@ -46,10 +46,7 @@ std::string Options::ExportToString(){
 
 int Options::Load(std::string opts){
   try{
-    // Holy cow. So the whole pointer thing is some lengths I went to to
-    // keep the stupid value in scope. You can't have a member variable with
-    // a non-pointer value since there is no way to initialize a default 'value'.
-    // So needs to be a pointer. Needs to stay in scope for as long as you might
+    // This needs to be a pointer. Needs to stay in scope for as long as you might
     // want to see the view.
     bson_value = new bsoncxx::document::value(bsoncxx::from_json(opts).view());
     bson_options = bson_value->view();
@@ -65,27 +62,73 @@ int Options::Load(std::string opts){
   return 0;
 }
 
+int Options::Override(bsoncxx::document::view override_opts){
+
+  // Here's the best way I can find to do this. We create a new doc, which
+  // is a concatenation of the two old docs (original first). Then we
+  // use the concatenation object to initialize a 'new' value for the
+  // combined doc and delete the orginal. A new view will point to the new value.
+
+  using bsoncxx::builder::stream::document;
+  using bsoncxx::builder::stream::finalize;
+  
+  //using bsoncxx::builder::concatenate;
+
+  auto doc = document{};
+  bsoncxx::document::value *new_value = new bsoncxx::document::value
+    ( document{}<<bsoncxx::builder::concatenate_doc{bson_options}<<
+      "override_doc" << bsoncxx::builder::stream::open_document<<
+      bsoncxx::builder::concatenate_doc{override_opts}<<
+      bsoncxx::builder::stream::close_document<<
+      finalize);
+  //builder<<concatenate(bson_options);
+  //builder<<concatenate(override_opts);
+  //doc<<finalize;
+  
+  // Create a new doc
+  //bsoncxx::document::value *new_value = new bsoncxx::document::value(doc.extract());
+
+  // Delete the original
+  delete bson_value;
+
+  // Set to new
+  bson_value = new_value;
+  bson_options = bson_value->view();
+
+  return 0;  
+}
+
 int Options::GetInt(std::string path, int default_value){
 
   try{
-    return bson_options[path.c_str()].get_int32();
+    return bson_options["override_doc"][path.c_str()].get_int32();
   }
   catch (const std::exception &e){
-    //LOG
-    std::cout<<e.what()<<std::endl;
-    return default_value;
+    try{
+      return bson_options[path.c_str()].get_int32();
+    }
+    catch (const std::exception &e){
+      //LOG
+      std::cout<<e.what()<<std::endl;
+      return default_value;
+    }
   }
   return -1;  
 }
 
 std::string Options::GetString(std::string path, std::string default_value){
   try{
-    return bson_options[path.c_str()].get_utf8().value.to_string();
+    return bson_options["override_doc"][path.c_str()].get_utf8().value.to_string();
   }
-  catch (const std::exception &e){
-    //LOG
-    std::cout<<e.what()<<std::endl;
-    return default_value;
+  catch(const std::exception &e){
+    try{
+      return bson_options[path.c_str()].get_utf8().value.to_string();
+    }
+    catch (const std::exception &e){
+      //LOG
+      std::cout<<e.what()<<std::endl;
+      return default_value;
+    }
   }
   return "";
 }

Options.hh

@@ -12,6 +12,7 @@
 #include <bsoncxx/json.hpp>
 #include <bsoncxx/document/view.hpp>
 #include <bsoncxx/document/value.hpp>
+#include <bsoncxx/builder/stream/document.hpp>
 #include <bsoncxx/exception/exception.hpp>
 #include "DAXHelpers.hh"
 
@@ -46,6 +47,8 @@ public:
   std::vector<RegisterType> GetRegisters(int board=-1);
 
   std::string ExportToString();
+  int Override(bsoncxx::document::view override_opts);
+  
 private:
   std::string defaultPath = "defaults/daxOptions.json";
   DAXHelpers *fHelper;

main.cc

@@ -112,39 +112,52 @@ int main(int argc, char** argv){
 	// Can only arm if we're in the idle, arming, or armed state
 	if(controller->status() == 0 || controller->status() == 1 || controller->status() == 2){
 	  controller->End();
+
+	  // Try to pull options from database and store in an 'optional' object
 	  string options = "";
+	  bsoncxx::stdx::optional<bsoncxx::document::value> trydoc;
 	  try{
 	    string option_name = doc["mode"].get_utf8().value.to_string();
 	    logger->Entry("Loading options " + option_name, MongoLog::Debug);
 
-	    bsoncxx::stdx::optional<bsoncxx::document::value> trydoc =
-	      options_collection.find_one(bsoncxx::builder::stream::document{}<<
-					  "name" << option_name.c_str() <<
-					  bsoncxx::builder::stream::finalize);
+	    trydoc = options_collection.find_one(bsoncxx::builder::stream::document{}<<
+						 "name" << option_name.c_str() <<
+						 bsoncxx::builder::stream::finalize);
 	    logger->Entry("Received arm command from user "+
 			  doc["user"].get_utf8().value.to_string() +
 			  " for mode " + option_name, MongoLog::Message);
-	    if(trydoc){
-	      options = bsoncxx::to_json(*trydoc);
-	      if(controller->InitializeElectronics(options)!=0){
-		logger->Entry("Failed to initialized electronics", MongoLog::Error);
-	      }
-	      else{
-		logger->Entry("Initialized electronics", MongoLog::Debug);
-	      }
-	      
-	      if(readoutThread!=NULL){
-		logger->Entry("Cannot start DAQ while readout thread from previous run active. Please perform a reset", MongoLog::Message);
-	      }
-	      else
-		readoutThread = new std::thread(DAQController::ReadThreadWrapper,
-						(static_cast<void*>(controller))); 
-	    }	  
 	  }
-	  catch( const std::exception &e){
+	  catch(const std::exception &e){
 	    logger->Entry("Want to arm boards but no valid mode provided", MongoLog::Warning);
-	    options = "";	  
+	    options = "";
+	  }
+
+	  // Get an override doc from the 'options_override' field if it exists
+	  std::string override_json = "";
+	  try{
+	    bsoncxx::document::view oopts = doc["options_override"].get_document().view();
+	    override_json = bsoncxx::to_json(oopts);
+	  }
+	  catch(const std::exception &e){
+	    logger->Entry("No override options provided, continue without.", MongoLog::Debug);
 	  }
+
+	  if(trydoc){
+	    options = bsoncxx::to_json(*trydoc);
+	    if(controller->InitializeElectronics(options, override_json)!=0){
+	      logger->Entry("Failed to initialized electronics", MongoLog::Error);
+	    }
+	    else{
+	      logger->Entry("Initialized electronics", MongoLog::Debug);
+	    }
+	    
+	    if(readoutThread!=NULL){
+	      logger->Entry("Cannot start DAQ while readout thread from previous run active. Please perform a reset", MongoLog::Message);
+	    }
+	    else
+	      readoutThread = new std::thread(DAQController::ReadThreadWrapper,
+					      (static_cast<void*>(controller))); 
+	  }	  
 	}
 	else
 	  logger->Entry("Cannot arm DAQ while not 'Idle'", MongoLog::Warning);