Another fix for readout words, run with 24 cores only

diff --git a/ADC/nodelist.txt b/ADC/nodelist.txt
index d5e65c5c2b3250600e4bf5bb22c98c8698674ab0..69960b7264d8173ae2d15b5b1bb0198c5a05394b 100644 (file)
--- a/ADC/nodelist.txt
+++ b/ADC/nodelist.txt
@@ -1,4 +1,4 @@
 [lxhadeb07]
 system = linux
-corenum = 32
+corenum = 24
 workdir = /home/aneiser/trb3/ADC/workdir

diff --git a/ADC/source/adc_processor_cfd_ch.vhd b/ADC/source/adc_processor_cfd_ch.vhd
index c121ab47a29e786024ffc87afad6a2d5c593dae1..5d234a866d050f12e746ea16798b25c4f4864d30 100644 (file)
--- a/ADC/source/adc_processor_cfd_ch.vhd
+++ b/ADC/source/adc_processor_cfd_ch.vhd
@@ -260,7 +260,7 @@ begin
         elsif CONF.DebugMode /= 0 and RAM_BSY_IN = '1' then
           -- at least one word is always dumped into the RAM
           -- don't move the ram pointer yet, it's already at next position
-          RAM_DATA(31 downto 24) <= x"cd";
+          RAM_DATA(31 downto 24) <= x"00";
           RAM_DATA(23 downto 20) <= std_logic_vector(to_unsigned(DEVICE, 4));
           RAM_DATA(19 downto 16) <= std_logic_vector(to_unsigned(CHANNEL, 4));
           RAM_DATA(15 downto  0) <= debug_mux;
@@ -299,7 +299,7 @@ begin
         
         
       when WRITE1 => 
-        RAM_DATA(31 downto 24) <= x"c0";
+        RAM_DATA(31 downto 24) <= x"d0";
         RAM_DATA(23 downto 20) <= std_logic_vector(to_unsigned(DEVICE, 4));
         RAM_DATA(19 downto 16) <= std_logic_vector(to_unsigned(CHANNEL, 4));
         RAM_DATA(15 downto  8) <= std_logic_vector(resize(epoch_counter_save(epoch_counter_save'high downto 16),8));