Merge pull request #369 from GSI-CS-CO/dmunipz_dietrich_2024-jul-16

Dmunipz dietrich 2024 jul 16

modules/b2b/Makefile

@@ -96,6 +96,7 @@ deploy:
 	cp $(SW)/b2b-viewer $(STAGING)$(ARCH)$(PREFIX)/usr/bin              # '/usr' is a hack 
 	cp $(SW)/b2b-archiver $(STAGING)$(ARCH)$(PREFIX)/usr/bin            # '/usr' is a hack
 	cp $(SW)/b2b-jitter-check $(STAGING)$(ARCH)$(PREFIX)/usr/bin        # '/usr' is a hack
+	cp $(SW)/b2b-serv-kickdiag $(STAGING)$(ARCH)$(PREFIX)/usr/bin       # '/usr' is a hack
 	cp $(FW)/*.bin $(STAGING)/firmware                   
 #	cp $(SW)/b2b-pname-info $(STAGING)$(ARCH)$(PREFIX)/usr/bin          # '/usr' is a hack; this is special and works only on ASL
 

modules/b2b/app/start-app-b2b-int-transfer-mon.sh

@@ -11,4 +11,4 @@ BASEDIR=$(cd "${SCRIPTDIR}/.." >/dev/null; pwd)
 # script for starting the b2b system viewer on INT
 export DIM_DNS_NODE=asl105
 export LD_LIBRARY_PATH=${BASEDIR}/lib
-xterm -T 'b2b monitor' -fa monaco -fs 10 -geometry 150x24 -e ${BASEDIR}/bin/b2b-mon int
+xterm -T 'b2b monitor' -fa monaco -fs 10 -geometry 166x24 -e ${BASEDIR}/bin/b2b-mon int

modules/b2b/app/start-app-b2b-pro-transfer-mon.sh

@@ -11,4 +11,4 @@ BASEDIR=$(cd "${SCRIPTDIR}/.." >/dev/null; pwd)
 # script for starting the b2b system viewer on INT
 export DIM_DNS_NODE=asl105
 export LD_LIBRARY_PATH=${BASEDIR}/lib
-xterm -T 'b2b monitor' -fa monaco -fs 10 -geometry 150x24 -e ${BASEDIR}/bin/b2b-mon pro
+xterm -T 'b2b monitor' -fa monaco -fs 10 -geometry 166x24 -e ${BASEDIR}/bin/b2b-mon pro

modules/b2b/fw/Makefile

@@ -12,7 +12,7 @@ RAM_SIZE        := $(shell cat 	$(PLATFMAKEFILE) | grep -m1 RAM_SIZE  | cut -d'=
 
 SHARED_SIZE    	?= 8K
 USRCPUCLK      	?= 125000
-VERSION  	= 00.07.00
+VERSION  	= 00.07.02
 
 .DEFAULT_GOAL	:= fwbin
 

modules/b2b/fw/b2b-cbu.c

@@ -35,7 +35,7 @@
  * For all questions and ideas contact: [email protected]
  * Last update: 23-April-2019
  ********************************************************************************************/
-#define B2BCBU_FW_VERSION 0x000700                                      // make this consistent with makefile
+#define B2BCBU_FW_VERSION 0x000702                                      // make this consistent with makefile
 
 // standard includes
 #include <stdio.h>

modules/b2b/fw/b2b-kd.c

@@ -34,7 +34,7 @@
  * For all questions and ideas contact: [email protected]
  * Last update: 19-November-2020
  ********************************************************************************************/
-#define B2BPM_FW_VERSION 0x000700                                       // make this consistent with makefile
+#define B2BPM_FW_VERSION 0x000702                                       // make this consistent with makefile
 
 // standard includes
 #include <stdio.h>

modules/b2b/fw/b2b-pm-stub.c

@@ -3,7 +3,7 @@
  *
  *  created : 2021
  *  author  : Dietrich Beck, GSI-Darmstadt
- *  version : 24-Feb-2023
+ *  version : 23-Nov-2023
  *
  *  firmware required for measuring the h=1 phase for ring machine
  *  
@@ -38,7 +38,7 @@
  * For all questions and ideas contact: [email protected]
  * Last update: 15-April-2019
  ********************************************************************************************/
-#define B2BPMSTUB_FW_VERSION 0x000700                                   // make this consistent with makefile
+#define B2BPMSTUB_FW_VERSION 0x000703                                   // make this consistent with makefile
 
 //standard includes
 #include <stdio.h>
@@ -386,7 +386,7 @@ uint32_t doActionOperation(uint64_t *tAct,                    // actual time
       // send command: transmit measured phase value to the network
       sendEvtId    = fwlib_buildEvtidV1(recGid, sendEvtNo, 0, recSid, recBpid, flagPMError);
       sendParam    = tH1_125ps;
-      sendDeadline = recDeadline + (uint64_t)COMMON_AHEADT;
+      sendDeadline = getSysTime() + (uint64_t)B2B_AHEADT;              // use a more aggressive deadline < COMMON_AHEADT
       fwlib_ebmWriteTM(sendDeadline, sendEvtId, sendParam, 0, 0);
 
       // send the confidence value of the phase fit to ECA (for monitoring purposes)
@@ -475,7 +475,7 @@ uint32_t doActionOperation(uint64_t *tAct,                    // actual time
         if (flagMatchDone) tmp.f = (float)dtMatch_as / 1000000000.0; // convert to float [ns]
         else               tmp.data = 0x7fffffff;                    // mark as invalid
         sendParam   |= (uint64_t)(tmp.data & 0xffffffff);            // low word; match diagnostic
-        sendDeadline = recDeadline + (uint64_t)COMMON_AHEADT;
+        sendDeadline = getSysTime() + (uint64_t)COMMON_AHEADT;       // use the more conservativ deadline
         fwlib_ebmWriteTM(sendDeadline, sendEvtId, sendParam, 0, 0);
 
         // send the confidence value of the phase fit to ECA (for monitoring purposes)

modules/b2b/fw/b2b-pm.c

@@ -3,7 +3,7 @@
  *
  *  created : 2019
  *  author  : Dietrich Beck, GSI-Darmstadt
- *  version : 05-Oct-2023
+ *  version : 15-Nov-2023
  *
  *  firmware required for measuring the h=1 phase for ring machine
  *  
@@ -42,7 +42,7 @@
  * For all questions and ideas contact: [email protected]
  * Last update: 15-April-2019
  ********************************************************************************************/
-#define B2BPM_FW_VERSION      0x000700                                  // make this consistent with makefile
+#define B2BPM_FW_VERSION      0x000702                                  // make this consistent with makefile
 
 // standard includes
 #include <stdio.h>
@@ -536,7 +536,7 @@ uint32_t doActionOperation(uint64_t *tAct,                    // actual time
       sendParam    = tH1_t.ns;
       sendTEF      = (uint32_t)( (int16_t)(tH1_t.ps)  & 0xffff);
       sendTEF     |= (uint32_t)((uint16_t)(tH1_t.dps) & 0xffff) << 16; 
-      sendDeadline = recDeadline + (uint64_t)COMMON_AHEADT;
+      sendDeadline = getSysTime() + (uint64_t)B2B_AHEADT;             // use a more aggressive deadline < COMMON_AHEADT
       fwlib_ebmWriteTM(sendDeadline, sendEvtId, sendParam, sendTEF, 0);
       //t2 = getSysTime();
       // send something to ECA (for monitoring purposes) chk do something useful here
@@ -637,7 +637,7 @@ uint32_t doActionOperation(uint64_t *tAct,                    // actual time
       //tmp1 = (int32_t)(dtMatch_as / 1000000); pp_printf("match3 [ps] %08d\n", tmp1); //pp_printf("match3 [hex float ns] %08x\n", tmp.data);
 
       sendParam   |= (uint64_t)(tmp.data & 0xffffffff);               // low word; match diagnostic
-      sendDeadline = recDeadline + (uint64_t)COMMON_AHEADT;
+      sendDeadline = getSysTime() + (uint64_t)COMMON_AHEADT;          // use a more conservative deadline
       fwlib_ebmWriteTM(sendDeadline, sendEvtId, sendParam, 0, 0);
 
       // send something to ECA (for monitoring purposes) chk do something useful here

modules/b2b/include/b2b.h

@@ -27,6 +27,7 @@
 #define B2B_ECADO_TLUINPUT2        0xa02   // event from IO2 (TLU)
 #define B2B_ECADO_TLUINPUT3        0xa03   // event from IO3 (TLU)
 #define B2B_ECADO_TLUINPUT4        0xa04   // event from IO4 (TLU)
+#define B2B_ECADO_TLUINPUT5        0xa05   // event from IO5 (TLU)
 #define B2B_ECADO_KICKSTART1        0x31   // SIS18 extraction: EVT_KICK_START1; ESR extraction: EVT_KICK_START2
 #define B2B_ECADO_KICKSTART2        0x45   // SIS18 extraction: EVT_KICK_START1; ESR extraction: EVT_KICK_START2
 #define B2B_ECADO_B2B_PMEXT        0x800   // command: perform phase measurement (extraction)
@@ -98,6 +99,7 @@
 #define B2B_PRETRIGGERINJKICK     300000    // offset [ns] used as pre-trigger on the injection kick event
 #define B2B_PRETRIGGERPR          250000    // offset [ns] used as pre-trigger on the PRINJ/PREXT event
 #define B2B_PRETRIGGERTR           20000    // offset [ns] used as pre-trigger on the trigger event
+#define B2B_AHEADT                300000    // more aggressive ahead interval for determining the deadline of a timing message
 #define B2B_ACCEPTKMON             10000    // timewindow [us]!!! in which monitor signal  from kicker electronics is expected
 #define B2B_ACCEPTKPROBE             100    // timewindow [us]!!! in which signals from kicker magnet probe are expected
 #define B2B_TDIAGOBS            15900000    // observation interval for phase diagnostic; a bit shorter than length of flat top

modules/b2b/include/b2blib.h

@@ -3,7 +3,7 @@
  *
  *  created : 2020
  *  author  : Dietrich Beck, GSI-Darmstadt
- *  version : 21-Sep-2023
+ *  version : 20-Nov-2023
  *
  * library for b2b
  *
@@ -41,7 +41,7 @@
 extern "C" {
 #endif
 
-#define B2BLIB_VERSION 0x000700
+#define B2BLIB_VERSION 0x000702
 
 // (error) codes; duplicated to avoid the need of joining bel_projects and acc git repos
 #define  B2BLIB_STATUS_OK                 0            // OK
@@ -81,9 +81,11 @@ extern "C" {
     uint64_t ext_T;                                    // extraction: period of h=1 Group DDS [as]
     uint32_t ext_h;                                    // extraction: harmonic number of rf
     float    ext_cTrig;                                // extraction: correction for extraction kicker [ns]
+    uint32_t ext_sid;                                  // extraction: ID of extraction sequence (redundant)
     uint64_t inj_T;                                    // injection : ...
     uint32_t inj_h;
     float    inj_cTrig;
+    uint32_t inj_sid;
     float    cPhase;                                   // phase correction for b2b mode
   } setval_t;
 

modules/b2b/nfs-init/int/b2b-int-esr-bg2-kickx.systemd

@@ -17,4 +17,6 @@ export DIM_DNS_NODE=asl105
 b2b-serv-sys dev/wbm0 -s int_esr-kdx &
 b2b-serv-raw tr1 -e1 int &
 b2b-analyzer int_esr &
+b2b-serv-kickdiag tr0 -r1 -m1 -i1 int &
+b2b-serv-kickdiag tr0 -r1 -m0 -i1 int &
 

modules/b2b/nfs-init/int/b2b-int-sis18-bg2-kickext.systemd

@@ -17,3 +17,4 @@ export DIM_DNS_NODE=asl105
 b2b-serv-sys dev/wbm0 -s int_sis18-kde &
 b2b-serv-raw tr1 -e0 int &
 b2b-analyzer int_sis18 &
+b2b-serv-kickdiag tr0 -r0 -m0 -i1 int &

modules/b2b/nfs-init/int/b2b-int-yr-bg2-hf2.systemd

@@ -0,0 +1,4 @@
+# this is a hack for sl7
+export DIM_DNS_NODE=asl105
+
+b2b-serv-sys dev/wbm0 -s int_yr-pm &

modules/b2b/nfs-init/int/b2b.tools

@@ -12,6 +12,7 @@ cp -a $MOUNTPOINT/$ARCH/usr/bin/b2b-viewer /usr/bin/
 cp -a $MOUNTPOINT/$ARCH/usr/bin/b2b-archiver /usr/bin/
 cp -a $MOUNTPOINT/$ARCH/usr/bin/b2b-mon /usr/bin/
 cp -a $MOUNTPOINT/$ARCH/usr/bin/b2b-jitter-check /usr/bin/
+cp -a $MOUNTPOINT/$ARCH/usr/bin/b2b-serv-kickdiag /usr/bin/
 mkdir /tmp/b2bivt
 cp -a $MOUNTPOINT/$ARCH/tmp/b2bivt/* /tmp/b2bivt
 # firmware

modules/b2b/nfs-init/pro/b2b-pro-esr-ex1-kickx.systemd

@@ -18,3 +18,5 @@ b2b-serv-sys dev/wbm0 -s pro_esr-kdx &
 b2b-serv-raw tr1 -e1 pro &
 b2b-jitter-check tr1 tr0 -p3 -t5 pro_esr-kdx &
 b2b-analyzer pro_esr &
+b2b-serv-kickdiag tr0 -r1 -m0 -i1 pro &
+b2b-serv-kickdiag tr0 -r1 -m1 -i1 pro &

modules/b2b/nfs-init/pro/b2b-pro-sis18-rt1-kickext.systemd

@@ -12,3 +12,4 @@ b2b-serv-sys dev/wbm0 -s pro_sis18-kde &
 b2b-serv-raw tr1 -e0 pro &
 b2b-jitter-check tr1 tr0 -p3 -t5 pro_sis18-kde &
 b2b-analyzer pro_sis18 &
+b2b-serv-kickdiag tr0 -r0 -m0 -i1 pro &

modules/b2b/nfs-init/pro/b2b-pro-yr-th1-kickext.systemd

@@ -10,3 +10,4 @@ export DIM_DNS_NODE=asl105
 
 b2b-serv-sys dev/wbm0 -s pro_yr-kde &
 b2b-jitter-check tr1 tr0 -p3 -t3 pro_yr-kde &
+b2b-serv-kickdiag tr0 -r2 -m0 -i1 pro &

modules/b2b/nfs-init/pro/b2b-pro-yr-th1-kickinj.systemd

@@ -18,3 +18,4 @@ b2b-serv-sys dev/wbm0 -s pro_yr-kdi &
 b2b-serv-raw tr1 -e2 pro &
 b2b-jitter-check tr1 tr0 -p3 -t3 pro_yr-kdi &
 b2b-analyzer pro_yr &
+b2b-serv-kickdiag tr0 -r2 -m1 -i1 pro &

modules/b2b/nfs-init/pro/b2b.tools

@@ -12,6 +12,7 @@ cp -a $MOUNTPOINT/$ARCH/usr/bin/b2b-viewer /usr/bin/
 cp -a $MOUNTPOINT/$ARCH/usr/bin/b2b-archiver /usr/bin/
 cp -a $MOUNTPOINT/$ARCH/usr/bin/b2b-mon /usr/bin/
 cp -a $MOUNTPOINT/$ARCH/usr/bin/b2b-jitter-check /usr/bin/
+cp -a $MOUNTPOINT/$ARCH/usr/bin/b2b-serv-kickdiag /usr/bin/
 
 mkdir /tmp/b2bivt
 cp -a $MOUNTPOINT/$ARCH/tmp/b2bivt/* /tmp/b2bivt

modules/b2b/x86/Makefile

@@ -30,7 +30,7 @@ $(info compiling x86 binaries for $(SYSENV))
 $(info ours CCFLAGS for c code is $(CCFLAGS))
 $(info ours CXFLAGS for c++ code is $(CXFLAGS))
 
-TARGETS     := b2b-ctl b2b-ui b2b-serv-sys b2b-client-sys b2b-viewer b2b-analyzer b2b-archiver b2b-mon b2b-pname-info b2b-serv-raw b2b-jitter-check b2b-sim
+TARGETS     := b2b-ctl b2b-ui b2b-serv-sys b2b-client-sys b2b-viewer b2b-analyzer b2b-archiver b2b-mon b2b-pname-info b2b-serv-raw b2b-jitter-check b2b-serv-kickdiag b2b-sim
 
 all: lib $(TARGETS)
 
@@ -61,6 +61,9 @@ b2b-archiver: b2b-archiver.c
 b2b-serv-raw: b2b-serv-raw.cpp
 	$(CXX) $(CFLAGS) $(CXFLAGS) ../../common-libs/x86/common-lib.c -o b2b-serv-raw b2b-serv-raw.cpp $(XLIBS) -ldim -lpthread
 
+b2b-serv-kickdiag: b2b-serv-kickdiag.cpp
+	$(CXX) $(CFLAGS) $(CXFLAGS) ../../common-libs/x86/common-lib.c -o b2b-serv-kickdiag b2b-serv-kickdiag.cpp $(XLIBS) -ldim -lpthread
+
 b2b-sim: b2b-sim.c
 	$(CC) $(CFLAGS) $(CCFLAGS) -o b2b-sim b2b-sim.c $(LIBS)	
 
@@ -77,7 +80,7 @@ lib: b2blib.c
 	ln -sf $(B2BLIB).1 $(B2BLIB)
 
 clean:
-	rm -f *.o b2b-mon b2b-pname-info b2b-ctl b2b-ui b2b-serv-sys b2b-client-sys b2b-analyzer b2b-viewer b2b-serv-raw b2b-archiver b2b-jitter-check b2b-sim libb2blib.so*
+	rm -f *.o b2b-mon b2b-pname-info b2b-ctl b2b-ui b2b-serv-sys b2b-client-sys b2b-analyzer b2b-viewer b2b-serv-raw b2b-archiver b2b-jitter-check b2b-serv-kickdiag b2b-sim libb2blib.so*
 
 install:
 	mkdir -p $(STAGING)$(ARCH)$(PREFIX)/bin	

modules/b2b/x86/b2b-analyzer.c

@@ -36,7 +36,7 @@
  * For all questions and ideas contact: [email protected]
  * Last update: 15-April-2019
  *********************************************************************************************/
-#define B2B_ANALYZER_VERSION 0x000700
+#define B2B_ANALYZER_VERSION 0x000702
 
 // standard includes 
 #include <unistd.h> // getopt

modules/b2b/x86/b2b-archiver.c

@@ -3,7 +3,7 @@
  *
  *  created : 2021
  *  author  : Dietrich Beck, GSI-Darmstadt
- *  version : 17-Oct-2023
+ *  version : 19-Jan-2024
  *
  * archives set and get values to data files
  *
@@ -34,7 +34,7 @@
  * For all questions and ideas contact: [email protected]
  * Last update: 15-April-2019
  *********************************************************************************************/
-#define B2B_ARCHIVER_VERSION 0x000700
+#define B2B_ARCHIVER_VERSION 0x000703
 
 // standard includes 
 #include <unistd.h> // getopt
@@ -62,17 +62,22 @@ const char* program;
 
 uint32_t   no_link_32    = 0xdeadbeef;
 uint64_t   no_link_64    = 0xdeadbeefce420651;
+double     no_link_dbl   = NAN;
 char       no_link_str[] = "NO_LINK";
 char       nan_str[]     = "nan";
 
 setval_t   dicSetval[B2B_NSID]; 
 getval_t   dicGetval[B2B_NSID];
 diagval_t  dicDiagval[B2B_NSID];
+double     dicKickLenExt[B2B_NSID];       // hackish, should be integrated into s.th. like getval
+double     dicKickCompLvlExt[B2B_NSID];   // hackish, should be integrated into s.th. like getval
 char       dicPName[B2B_NSID][DIMMAXSIZE];
 
 uint32_t   dicSetvalId[B2B_NSID];
 uint32_t   dicGetvalId[B2B_NSID];
 uint32_t   dicDiagvalId[B2B_NSID];
+uint32_t   dicKickLenExtId[B2B_NSID];
+uint32_t   dicKickCompLvlExtId[B2B_NSID];
 uint32_t   dicPNameId[B2B_NSID];
 
 // global variables
@@ -104,7 +109,7 @@ static void help(void) {
 // header String for file
 char * headerString()
 {
-  return "patternName; time_CBS_UTC; sid; mode; ext_T [as]; ext_h; ext_cTrig; inj_T; inj_h; inj_cTrig; cPhase; ext_phase; ext_phaseFract; ext_phaseErr; ext_maxsysErr; ext_dKickMon; ext_dKickProb; ext_diagPhase; ext_diag_Match; inj_phase; inj_phaseFract; inj_phaseErr; inj_maxsysErr; inj_dKickMon; inj_dKickProb; inj_diagPhase; inj_diagMatch; received PME; PMI; PRE; PRI; KTE; KTI; KDE; KDI; PDE; PDI; error PME; PMI; PRE; PRI; KTE; KTI; KDE; KDI; PDE; PDI; late PME; PMI; PRE; PRI; KTE; KTI; KDE; KDI; PDE; PDI; fin-CBS; prr-CBS; t0E-CBS; t0I-CBS; kte-CBS; kti-CBS; ext_nueGet; ext_dNueGet; inj_nueGet; inj_dNueGet";
+  return "patternName; time_CBS_UTC; sid; mode; ext_T [as]; ext_h; ext_cTrig; inj_T; inj_h; inj_cTrig; cPhase; ext_phase; ext_phaseFract; ext_phaseErr; ext_maxsysErr; ext_dKickMon; ext_kickCompLvl; ext_dkickProb; ext_kickLen; ext_diagPhase; ext_diag_Match; inj_phase; inj_phaseFract; inj_phaseErr; inj_maxsysErr; inj_dKickMon; inj_dKickProb; inj_diagPhase; inj_diagMatch; received PME; PMI; PRE; PRI; KTE; KTI; KDE; KDI; PDE; PDI; error PME; PMI; PRE; PRI; KTE; KTI; KDE; KDI; PDE; PDI; late PME; PMI; PRE; PRI; KTE; KTI; KDE; KDI; PDE; PDI; fin-CBS; prr-CBS; t0E-CBS; t0I-CBS; kte-CBS; kti-CBS; ext_nueGet; ext_dNueGet; inj_nueGet; inj_dNueGet";
 } // headerString
 
 // receive get values
@@ -160,8 +165,10 @@ void recGetvalue(long *tag, diagval_t *address, int *size)
   new += sprintf(new, "; %7.3f"    ,  dicGetval[sid].ext_phaseFract);
   new += sprintf(new, "; %7.3f"    ,  dicGetval[sid].ext_phaseErr);
   new += sprintf(new, "; %5.3f"    ,  dicGetval[sid].ext_phaseSysmaxErr);
-  new += sprintf(new, "; %f"       ,  dicGetval[sid].ext_dKickMon);
-  new += sprintf(new, "; %f"       ,  dicGetval[sid].ext_dKickProb);
+  new += sprintf(new, "; %7.1f"    ,  dicGetval[sid].ext_dKickMon);
+  new += sprintf(new, "; %7.3f"    ,  dicKickCompLvlExt[sid]);
+  new += sprintf(new, "; %7.1f"    ,  dicGetval[sid].ext_dKickProb);
+  new += sprintf(new, "; %7.1f"    ,  dicKickLenExt[sid]);
 
   if (isnan(dicGetval[sid].ext_diagPhase) || (dicSetval[sid].ext_T == -1)) new += sprintf(new, "; %s"    , nan_str);
   else {
@@ -182,8 +189,8 @@ void recGetvalue(long *tag, diagval_t *address, int *size)
   new += sprintf(new, "; %7.3f"   , dicGetval[sid].inj_phaseFract);
   new += sprintf(new, "; %7.3f"   , dicGetval[sid].inj_phaseErr);
   new += sprintf(new, "; %5.3f"   , dicGetval[sid].inj_phaseSysmaxErr);
-  new += sprintf(new, "; %f"      , dicGetval[sid].inj_dKickMon);
-  new += sprintf(new, "; %f"      , dicGetval[sid].inj_dKickProb);
+  new += sprintf(new, "; %7.1f"   , dicGetval[sid].inj_dKickMon);
+  new += sprintf(new, "; %7.1f"   , dicGetval[sid].inj_dKickProb);
 
   if (isnan(dicGetval[sid].inj_diagPhase) || (dicSetval[sid].inj_T == -1)) new += sprintf(new, "; %s"   , nan_str);
   else {
@@ -251,6 +258,12 @@ void dicSubscribeServices(char *prefix)
     sprintf(name, "%s-cal_diag_sid%02d", prefix, i);
     dicDiagvalId[i]    = dic_info_service_stamped(name, MONITORED, 0, &(dicDiagval[i]), sizeof(diagval_t), 0, 0, &no_link_32, sizeof(uint32_t));
 
+    sprintf(name, "%s-kdde_sid%02d_len", prefix, i);
+    dicKickLenExtId[i] = dic_info_service_stamped(name, MONITORED, 0, &(dicKickLenExt[i]), sizeof(double), 0 , 0, &no_link_dbl, sizeof(double));
+
+    sprintf(name, "%s-kse_setlevel", prefix);
+    dicKickCompLvlExtId[i] = dic_info_service_stamped(name, MONITORED, 0, &(dicKickCompLvlExt[i]), sizeof(double), 0 , 0, &no_link_dbl, sizeof(double));
+
     sleep (2);  // data is taken upon callback of set-values; wait a bit until the other services have connected to their servers
 
     sprintf(name, "%s-raw_sid%02d_getval", prefix, i);

modules/b2b/x86/b2b-client-sys.c

@@ -34,7 +34,7 @@
  * For all questions and ideas contact: [email protected]
  * Last update: 15-April-2019
  *********************************************************************************************/
-#define B2B_CLIENT_SYS_VERSION 0x000700
+#define B2B_CLIENT_SYS_VERSION 0x000702
 
 // standard includes 
 #include <unistd.h> // getopt

modules/b2b/x86/b2b-int-esr-bg2-kick_start.sh

@@ -101,6 +101,8 @@ saft-io-ctl $SDTRIGTEST -n IO1 -c 0x1154805000000000 0xfffffff000000000 4400 0x0
 saft-io-ctl $SDTRIGTEST -n IO2 -o 1 -t 0 -a 1
 saft-io-ctl $SDTRIGTEST -n IO2 -c 0x1154804000000000 0xfffffff000000000 6400 0x0 1 -u
 saft-io-ctl $SDTRIGTEST -n IO2 -c 0x1154804000000000 0xfffffff000000000 6600 0x0 0 -u
-# config test pulse for probe extraction
-# config test pulse for probe extraction
+saft-io-ctl $SDTRIGTEST -n IO1 -o 1 -t 0 -a 1
+saft-io-ctl $SDTRIGTEST -n IO1 -c 0x1154804000000000 0xfffffff000000000 7200 0x0 1 -u
+saft-io-ctl $SDTRIGTEST -n IO1 -c 0x1154804000000000 0xfffffff000000000 7400 0x0 0 -u
+
 # config test pulse for probe extraction

modules/b2b/x86/b2b-jitter-check.cpp

@@ -37,7 +37,7 @@
  * For all questions and ideas contact: [email protected]
  * Last update: 15-April-2019
  *********************************************************************************************/
-#define B2B_JITTER_CHECK_VERSION 0x000700
+#define B2B_JITTER_CHECK_VERSION 0x000702
 
 #define __STDC_FORMAT_MACROS
 #define __STDC_CONSTANT_MACROS
@@ -503,7 +503,7 @@ int main(int argc, char** argv)
     evtPrefix |= ioPrefix;            
     snoopID    = evtPrefix + 0x1; // last bit is set: rising edge
     //printf("id %llx\n", snoopID);
-    condition  = SoftwareCondition_Proxy::create(sink->NewCondition(false, snoopID, 0xffffffffffffffff, 17));
+    condition  = SoftwareCondition_Proxy::create(sink->NewCondition(false, snoopID, 0xffffffffffffffff, 0));
     condition->setAcceptLate(true);
     condition->setAcceptEarly(true);
     condition->setAcceptConflict(true);