Tweaks

Author: darrylmasson

DAQController.cc

@@ -241,7 +241,7 @@ void DAQController::ReadData(int link){
     if (local_buffer.size() > 0) {
       fDataRate += local_size;
       int selector = (fCounter++)%fNProcessingThreads;
-      fFormatters[selector]->ReceiveDatapackets(local_buffer);
+      fFormatters[selector]->ReceiveDatapackets(local_buffer, local_size);
       local_size = 0;
     }
     readcycler++;

StraxFormatter.cc

@@ -31,6 +31,7 @@ StraxFormatter::StraxFormatter(std::shared_ptr<Options>& opts, std::shared_ptr<M
   fChunkLength = long(fOptions->GetDouble("strax_chunk_length", 5)*1e9); // default 5s
   fChunkOverlap = long(fOptions->GetDouble("strax_chunk_overlap", 0.5)*1e9); // default 0.5s
   fFragmentBytes = fOptions->GetInt("strax_fragment_payload_bytes", 110*2);
+  FullFragmentSize = fFragmentBytes + fStraxHeaderSize;
   fCompressor = fOptions->GetString("compressor", "lz4");
   fFullChunkLength = fChunkLength+fChunkOverlap;
   fHostname = fOptions->Hostname();
@@ -39,6 +40,7 @@ StraxFormatter::StraxFormatter(std::shared_ptr<Options>& opts, std::shared_ptr<M
   if (run_num == -1) run_name = "run";
   else {
     run_name = std::to_string(run_num);
+    // chunk names are 6 digits long
     if (run_name.size() < 6) run_name.insert(0, 6 - run_name.size(), int('0'));
   }
 
@@ -97,24 +99,21 @@ void StraxFormatter::GetDataPerChan(std::map<int, int>& ret) {
 
 void StraxFormatter::GenerateArtificialDeadtime(int64_t timestamp, const std::shared_ptr<V1724>& digi) {
   std::string fragment;
-  fragment.reserve(fFragmentBytes + fStraxHeaderSize);
-  timestamp *= digi->GetClockWidth();
-  fragment.append((char*)&timestamp, sizeof(timestamp));
+  fragment.reserve(fFullFragmentSize);
+  timestamp *= digi->GetClockWidth(); // TODO nv
   int32_t length = fFragmentBytes>>1;
+  int16_t sw = digi->SampleWidth(), channel = digi->GetADChannel(), zero = 0;
+  fragment.append((char*)&timestamp, sizeof(timestamp));
   fragment.append((char*)&length, sizeof(length));
-  int16_t sw = digi->SampleWidth();
   fragment.append((char*)&sw, sizeof(sw));
-  int16_t channel = 790; // TODO add MV and NV support
   fragment.append((char*)&channel, sizeof(channel));
   fragment.append((char*)&length, sizeof(length));
-  int16_t fragment_i = 0;
-  fragment.append((char*)&fragment_i, sizeof(fragment_i));
-  int16_t baseline = 0;
-  fragment.append((char*)&baseline, sizeof(baseline));
-  int16_t zero = 0;
+  fragment.append((char*)&zero, sizeof(zero)); // fragment_i
+  fragment.append((char*)&zero, sizeof(zero)); // baseline
   for (; length > 0; length--)
-    fragment.append((char*)&zero, sizeof(zero));
+    fragment.append((char*)&zero, sizeof(zero)); // wf
   AddFragmentToBuffer(std::move(fragment), 0, 0);
+  return;
 }
 
 void StraxFormatter::ProcessDatapacket(std::unique_ptr<data_packet> dp){
@@ -176,8 +175,9 @@ int StraxFormatter::ProcessEvent(std::u32string_view buff,
   buff.remove_prefix(event_header_words);
   int ret;
   int frags(0);
+  unsigned n_chan = dp->digi->GetNumChannels();
 
-  for(unsigned ch=0; ch<max_channels; ch++){
+  for(unsigned ch=0; ch<n_chan; ch++){
     if (channel_mask & (1<<ch)) {
       clock_gettime(CLOCK_THREAD_CPUTIME_ID, &ch_start);
       ret = ProcessChannel(buff, words, channel_mask, event_time, frags, ch, dp, dpc);
@@ -210,16 +210,19 @@ int StraxFormatter::ProcessChannel(std::u32string_view buff, int words_in_event,
 
   int num_frags = std::ceil(1.*samples_in_pulse/samples_per_frag);
   frags += num_frags;
+  int32_t samples_this_frag = 0;
+  int64_t time_this_frag = 0;
+  const uint16_t filler = 0;
   for (uint16_t frag_i = 0; frag_i < num_frags; frag_i++) {
     std::string fragment;
-    fragment.reserve(fFragmentBytes + fStraxHeaderSize);
+    fragment.reserve(fFullFragmentSize);
 
     // How long is this fragment?
-    int32_t samples_this_frag = samples_per_frag;
+    samples_this_frag = samples_per_frag;
     if (frag_i == num_frags-1)
       samples_this_frag = samples_in_pulse - frag_i*samples_per_frag;
 
-    int64_t time_this_frag = timestamp + samples_per_frag*sw*frag_i;
+    time_this_frag = timestamp + samples_per_frag*sw*frag_i;
     fragment.append((char*)&time_this_frag, sizeof(time_this_frag));
     fragment.append((char*)&samples_this_frag, sizeof(samples_this_frag));
     fragment.append((char*)&sw, sizeof(sw));
@@ -231,7 +234,6 @@ int StraxFormatter::ProcessChannel(std::u32string_view buff, int words_in_event,
     // Copy the raw buffer
     fragment.append((char*)wf.data(), samples_this_frag*sizeof(uint16_t));
     wf.remove_prefix(samples_this_frag*sizeof(uint16_t)/sizeof(char32_t));
-    uint16_t zero_filler = 0;
     for (; samples_this_frag < samples_per_frag; samples_this_frag++)
       fragment.append((char*)&zero_filler, sizeof(zero_filler));
 
@@ -264,7 +266,7 @@ void StraxFormatter::AddFragmentToBuffer(std::string fragment, uint32_t ts, int
         fThreadId, chunk_id - max_chunk - 1, channel);
   }
 
-  fOutputBufferSize += fFragmentBytes + fStraxHeaderSize;
+  fOutputBufferSize += fFullFragmentSize;
 
   if(!overlap){
     fChunks[chunk_id].emplace_back(std::move(fragment));
@@ -273,11 +275,12 @@ void StraxFormatter::AddFragmentToBuffer(std::string fragment, uint32_t ts, int
   }
 }
 
-void StraxFormatter::ReceiveDatapackets(std::list<std::unique_ptr<data_packet>>& in) {
+void StraxFormatter::ReceiveDatapackets(std::list<std::unique_ptr<data_packet>>& in, int bytes) {
   {
     const std::lock_guard<std::mutex> lk(fBufferMutex);
     fBufferCounter[in.size()]++;
     fBuffer.splice(fBuffer.end(), in);
+    fInputBufferSize += bytes;
   }
   fCV.notify_one();
 }
@@ -332,7 +335,7 @@ void StraxFormatter::WriteOutChunk(int chunk_i){
 
   for (int i = 0; i < 2; i++) {
     if (buffers[i]->size() == 0) continue;
-    uncompressed_size[i] = buffers[i]->size()*(fFragmentBytes + fStraxHeaderSize);
+    uncompressed_size[i] = buffers[i]->size()*fFullFragmentSize;
     uncompressed.reserve(uncompressed_size[i]);
     for (auto it = buffers[i]->begin(); it != buffers[i]->end(); it++)
       uncompressed += *it; // std::accumulate would be nice but 3x slower without -O2

StraxFormatter.hh

@@ -58,7 +58,7 @@ public:
   void Process();
   std::pair<int, int> GetBufferSize() {return {fInputBufferSize.load(), fOutputBufferSize.load()};}
   void GetDataPerChan(std::map<int, int>& ret);
-  void ReceiveDatapackets(std::list<std::unique_ptr<data_packet>>&);
+  void ReceiveDatapackets(std::list<std::unique_ptr<data_packet>>&, int);
 
 private:
   void ProcessDatapacket(std::unique_ptr<data_packet> dp);
@@ -83,6 +83,7 @@ private:
   int64_t fChunkOverlap; // ns
   int fFragmentBytes;
   int fStraxHeaderSize; // bytes
+  int fFullFragmentSize;
   int fBufferNumChunks;
   int fWarnIfChunkOlderThan;
   unsigned fChunkNameLength;

V1724.cc

@@ -39,6 +39,7 @@ V1724::V1724(std::shared_ptr<MongoLog>& log, std::shared_ptr<Options>& opts, int
   BLT_SIZE = opts->GetInt("blt_size", 512*1024);
   // there's a more elegant way to do this, but I'm not going to write it
   fClockPeriod = std::chrono::nanoseconds((1l<<31)*fClockCycle);
+  fArtificialDeadtimeChannel = 790;
 
   if (Init(link, crate, opts)) {
     throw std::runtime_error("Board init failed");

V1724.hh

@@ -27,6 +27,7 @@ class V1724{
   int bid() {return fBID;}
   uint16_t SampleWidth() {return fSampleWidth;}
   int GetClockWidth() {return fClockCycle;}
+  int16_t GetADChannel() {return fArtificialDeadtimeChannel;}
 
   virtual int LoadDAC(std::vector<uint16_t>&);
   void ClampDACValues(std::vector<uint16_t>&, std::map<std::string, std::vector<double>>&);
@@ -90,6 +91,7 @@ protected:
 
   float fBLTSafety, fBufferSafety;
   int fSampleWidth, fClockCycle;
+  int16_t fArtificialDeadtimeChannel;
 };
 
 

V1724_MV.cc

@@ -6,6 +6,7 @@ V1724_MV::V1724_MV(std::shared_ptr<MongoLog>& log, std::shared_ptr<Options>& opt
 V1724(log, opts, link, crate, bid, address) {
   // MV boards seem to have reg 0x1n80 for channel n threshold
   fChTrigRegister = 0x1080;
+  fArtificialDeadtimeChannel = 791;
 }
 
 V1724_MV::~V1724_MV(){}

V1730.cc

@@ -7,6 +7,7 @@ V1730::V1730(std::shared_ptr<MongoLog>& log, std::shared_ptr<Options>& options,
   fNChannels = 16;
   fSampleWidth = 2;
   fClockCycle = 2;
+  fArtificialDeadtimeChannel = 792;
 }
 
 V1730::~V1730(){}