ffs

Author: xedaq

CControl_Handler.cc

@@ -163,7 +163,7 @@ void CControl_Handler::StatusUpdate(mongocxx::collection* collection){
 	     << close_document;
   }
   auto after_array = in_array << close_array;
-  auto doc = after_array << close_document << finalize;
+  auto doc = after_array << finalize;
   collection->insert_one(std::move(doc));
   return;
   /*

DAQController.cc

@@ -75,7 +75,7 @@ int DAQController::Arm(std::shared_ptr<Options>& options){
   sleep(2); // <-- this one. Leave it here.
   // Seriously. This sleep statement is absolutely vital.
   fLog->Entry(MongoLog::Local, "That felt great, thanks.");
-  std::map<int, std::map<std::string, std::vector<double>>> dac_values;
+  std::map<int, std::vector<uint16_t>> dac_values;
   std::vector<std::thread> init_threads;
   init_threads.reserve(fDigitizers.size());
   std::map<int,int> rets;
@@ -325,7 +325,7 @@ void DAQController::StatusUpdate(mongocxx::collection* collection) {
         doc << std::to_string(pair.first) << short(pair.second>>10); // KB not MB
       } << close_document << 
     close_document << finalize;
-  collection->update_one(std::move(doc)); // opts is const&
+  collection->insert_one(std::move(doc)); // opts is const&
   return;
 }
 
@@ -376,7 +376,7 @@ void DAQController::InitLink(std::vector<std::shared_ptr<V1724>>& digis,
     }
     success += digi->LoadDAC(dac_values[bid]);
     // Load all the other fancy stuff
-    success += digi->SetThresholds(fOptions->GetThresholds(bid), digi->GetNumChannels());
+    success += digi->SetThresholds(fOptions->GetThresholds(bid));
 
     fLog->Entry(MongoLog::Local, "Board %i programmed", digi->bid());
     if(success!=0){

MongoLog.cc

@@ -125,7 +125,7 @@ int MongoLog::Entry(int priority, std::string message, ...){
         "user" << fHostname <<
         "message" << message <<
         "priority" << priority <<
-        "runid" << fRunid <<
+        "runid" << fRunId <<
         bsoncxx::builder::stream::finalize;
       fMongoCollection.insert_one(std::move(d));
     }

Options.cc

@@ -337,10 +337,10 @@ std::vector<uint16_t> Options::GetDAC(int bid, int num_chan, uint16_t default_va
   using namespace bsoncxx::builder::stream;
   std::vector<uint16_t> ret(num_chan, default_value);
   auto sort_order = document{} << "_id" << -1 << finalize;
-  auto q = document{} << bid << open_document << "$exists" << 1 << close_document << finalize;
+  auto q = document{} << std::to_string(bid) << open_document << "$exists" << 1 << close_document << finalize;
   auto opts = mongocxx::options::find{};
   opts.sort(sort_order.view());
-  auto cursor = fDAC_collection.find(q, opts);
+  auto cursor = fDAC_collection.find(std::move(q), opts);
   auto doc = cursor.begin();
   if (doc == cursor.end() || doc->find(std::to_string(bid)) == doc->end()) {
     fLog->Entry(MongoLog::Local, "No baseline calibrations? You must be new");
@@ -353,7 +353,7 @@ std::vector<uint16_t> Options::GetDAC(int bid, int num_chan, uint16_t default_va
  * }
  */
   for (int i = 0; i < num_chan; i++)
-    ret[i] = (*doc)[std::to_string(bid)][i];
+    ret[i] = (*doc)[std::to_string(bid)][i].get_int32();
   return ret;
 }