Merge pull request #11 from artlbv/feature_TOA_DAC_setting

Add TOA DAC threshold setting
CMS-HGCAL · Sep 25, 2018 · 7dc0ff0 · 7dc0ff0
2 parents 2bbccf4 + 6da7986
commit 7dc0ff0
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/daq-zmq-server.py b/daq-zmq-server.py
@@ -48,6 +48,7 @@
                 the_bit_string.set_lg_shaping_time(daq_options['shapingTime'])
                 the_bit_string.set_hg_shaping_time(daq_options['shapingTime'])
                 the_bit_string.set_tot_dac_threshold(daq_options['totDACThreshold'])
+                the_bit_string.set_toa_dac_threshold(daq_options['toaDACThreshold'])
                 the_bit_string.Print()
                 the_bits_c_uchar_p=the_bit_string.get_48_unsigned_char_p()
                 outputBitString=theDaq.configure(the_bits_c_uchar_p)

diff --git a/default-config.yaml b/default-config.yaml
@@ -12,6 +12,7 @@ daq_options:
  pulseDelay: 47
  preampFeedbackCapacitance: 8 
  totDACThreshold: 200
+ toaDACThreshold: 270
  shapingTime: 35
 glb_options:
  moduleNumber: 63

diff --git a/skiroc2cms_bit_string.py b/skiroc2cms_bit_string.py
@@ -102,6 +102,12 @@ def set_tot_dac_threshold(self,thr):
         for i in range(0,10):
             bit=(thr>>i)&1
             self.bits[61+i]=bit
-
+
+    def set_toa_dac_threshold(self,thr):
+        thr=thr&0x3ff
+        for i in range(0,10):
+            bit=(thr>>i)&1
+            self.bits[51+i]=bit
+
     def Print(self):
         print(self.bits)