From 7d4ce5335a74e921ebaa9db4eb569ff693ebd4d9 Mon Sep 17 00:00:00 2001
From: Jerzy Jamroz <jerzy.jamroz@gmail.com>
Date: Mon, 2 Dec 2024 10:10:43 +0100
Subject: [PATCH] revert: evrMrmApp/Db/mrmevrtsabs.template removed

- There is a possibility to bind 1 abs event to many * relative events.
- Minor fixes
- Code-SP added to control event codes without knowing the OBJ.
---
 evrApp/Db/evreventutag.db         | 16 ++++++++++++++++
 evrMrmApp/Db/Makefile             |  1 -
 evrMrmApp/Db/mrmevrtsabs.template | 21 ---------------------
 evrMrmApp/Db/mrmevrtsbuf.db       |  3 +--
 4 files changed, 17 insertions(+), 24 deletions(-)
 delete mode 100644 evrMrmApp/Db/mrmevrtsabs.template

diff --git a/evrApp/Db/evreventutag.db b/evrApp/Db/evreventutag.db
index a884b3af..3ac2c9c7 100644
--- a/evrApp/Db/evreventutag.db
+++ b/evrApp/Db/evreventutag.db
@@ -25,3 +25,19 @@ record(calc, "$(EN)Cnt-I") {
   field(INPA, "$(EN)Cnt-I NPP")
   $(SFTSEN=)field(TSEL, "$(EN)-SP.TIME")
 }
+
+record(longout, "$(EN)Code-SP") {
+  field(DESC, "Event Code")
+  field(VAL , "$(CODE=255)")
+  field(PINI, "YES")
+  alias("$(EN)Code-RB")
+  info(autosaveFields_pass0, "VAL")
+}
+
+record(printf, "$(EN)Code-Lock_") {
+  field(ASG, "private")
+  field(DISP, "1")
+  field(FMT, "@OBJ=$(OBJ),Code=%u")
+  field(INP0, "$(EN)Code-SP CPP")
+  field(OUT, "$(EN)-SP.OUT CP")
+}
diff --git a/evrMrmApp/Db/Makefile b/evrMrmApp/Db/Makefile
index 0be4cf59..d7f73849 100644
--- a/evrMrmApp/Db/Makefile
+++ b/evrMrmApp/Db/Makefile
@@ -11,7 +11,6 @@ DB += mrmevrbase.template
 DB += mrmevrdc.template
 DB += mrmevrbufrx.db
 DB += mrmevrtsbuf.db
-DB += mrmevrtsabs.template
 DB += sequencedemo.db
 DB += mrmevrdlymodule.template
 DB += evrSoftSeq.template
diff --git a/evrMrmApp/Db/mrmevrtsabs.template b/evrMrmApp/Db/mrmevrtsabs.template
deleted file mode 100644
index 2e59e560..00000000
--- a/evrMrmApp/Db/mrmevrtsabs.template
+++ /dev/null
@@ -1,21 +0,0 @@
-# "evreventutag.db" and the "mrmevrtsbuf.db" extension with absolute related adaptation
-## Use "$(P)$(Evt=)TsAbsCode-SP" to set the reference event for the absolute timestamp acquisition
-## Use "$(P)$(Evt=)Cnt-I" as the absolute timestamp source
-## Use "$(P)$(Evt=)TS-I" as the relative timestamp source
-
-record(longout, "$(P)$(Evt=)TsAbsCode-SP") {
-  field(DESC, "Distribute event to all sources")
-  field(VAL , "$(CODE=255)")
-  field(PINI, "YES")
-  field(OUT, "$(P)$(Evt=)FlshEvt-SP CP")
-  info(autosaveFields_pass0, "VAL")
-  alias("$(P)$(Evt=)TsAbsCode-RB")
-}
-
-record(printf, "$(P)$(Evt=)TsAbsLock_") {
-  field(ASG, "private")
-  field(DISP, "1")
-  field(FMT, "@OBJ=$(EVR),Code=%u")
-  field(INP0, "$(P)$(Evt=)TsAbsCode-SP CPP")
-  field(OUT, "$(P)$(Evt=)-SP.OUT CP")
-}
diff --git a/evrMrmApp/Db/mrmevrtsbuf.db b/evrMrmApp/Db/mrmevrtsbuf.db
index 92e9c536..a46fcfea 100644
--- a/evrMrmApp/Db/mrmevrtsbuf.db
+++ b/evrMrmApp/Db/mrmevrtsbuf.db
@@ -30,7 +30,6 @@ record(waveform, "$(P)TS-I") {
   field(NELM, "$(NELM=128)")
   field(TSE , "-2")
   field(EGU , "ns")
-  info(autosaveFields_pass0, "NELM")
 }
 
 record(longout, "$(P)CptEvt-SP") {
@@ -88,7 +87,7 @@ record(calc, "$(P)DropRate-I") {
   field(CALC, "C:=A-B;B:=A;C/10")
 }
 
-record(waveform, "$(P)TsBufLabel-I") {
+record(waveform, "$(P)TSLabel-I") {
   field(DESC, "$(DESC)")
   field(FTVL, "CHAR")
   field(NELM, "128")