last changes to triggerbox design - comments and few changed constraints

diff --git a/triggerbox/trb3sc_triggerbox.lpf b/triggerbox/trb3sc_triggerbox.lpf
index 9dcbb50fbf2b6b18c487071a36c800e73ef90238..12043bdb926bf6e1a71cc0e02e873f814f66add2 100644 (file)
--- a/triggerbox/trb3sc_triggerbox.lpf
+++ b/triggerbox/trb3sc_triggerbox.lpf
@@ -23,11 +23,13 @@ MULTICYCLE FROM CELL "THE_BOX/THE_SCALER/gen_scalers.*.cnt*" TO CELL "THE_BOX/TH
 BLOCK PATH TO   CELL "THE_BOX/list_of_scale*";
 
 PRIORITIZE NET "THE_BOX/temp_processed_inp*" 20;
-PRIORITIZE NET "THE_BOX/processed_inp*" 20;
+PRIORITIZE NET "THE_BOX/processed_inp*" 30;
 # PRIORITIZE NET "THE_BOX/reg_processed_inp*" 20;
 
 # MULTICYCLE TO   CELL  "THE_BOX/gen_coincs.*.THE_COINC/reg_in*" 2x ;
 
+MAXDELAY NET "THE_BOX/processed_inp*" 4 ns; 
+
 REGION "COINMULT_region" "R35C70" 34 65;
 LOCATE UGROUP "THE_BOX/gen_coincs.0.THE_COINC/coinc_proc"  REGION "COINMULT_region";
 LOCATE UGROUP "THE_BOX/gen_coincs.1.THE_COINC/coinc_proc"  REGION "COINMULT_region";

diff --git a/triggerbox/trb3sc_triggerbox.prj b/triggerbox/trb3sc_triggerbox.prj
index bf3b544369732bf0e9446a5001bad1d791476085..ba78b8859680fad3e24444f557b0fc0ebb9b7b5f 100644 (file)
--- a/triggerbox/trb3sc_triggerbox.prj
+++ b/triggerbox/trb3sc_triggerbox.prj
@@ -46,6 +46,7 @@ project -result_file "workdir/trb3sc_triggerbox.edf"
 #implementation attributes
 
 set_option -vlog_std v2001
+set_option -vhdl2008 1
 set_option -project_relative_includes 1
 impl -active "workdir"
 

diff --git a/triggerbox/trb3sc_triggerbox.vhd b/triggerbox/trb3sc_triggerbox.vhd
index 7826aeb3b58819b5954b35b258ff2291a7c29c4c..54eff75dcfb737d0445de3a56f2a9295190cc085 100644 (file)
--- a/triggerbox/trb3sc_triggerbox.vhd
+++ b/triggerbox/trb3sc_triggerbox.vhd
@@ -413,6 +413,7 @@ THE_ENDPOINT : entity work.trb_net16_endpoint_hades_full_handler_record
 ---------------------------------------------------------------------------
 -- TriggerBox
 ---------------------------------------------------------------------------
+--                95        80        79        48        47        32        31        0
 sorted_INP <= INP(95 downto 80) & INP(63 downto 32) & INP(79 downto 64) & INP(31 downto 0);
 --order from 0: ADA1 - KEL1 - ADA2 - KEL2