diff --git a/evgMrmApp/Db/Makefile b/evgMrmApp/Db/Makefile index 87c62ef1..eb6814d9 100644 --- a/evgMrmApp/Db/Makefile +++ b/evgMrmApp/Db/Makefile @@ -25,7 +25,7 @@ DB += evgDbus.db DB += evgAcTrig.db DB += evgInput.db DB += evgOutput.db -DB += evgSoftSeq.db +DB += evgSoftSeq.template DB += evm-fct.template DB += cpci-evg-300.db DB += vme-evg230.db diff --git a/evgMrmApp/Db/evgSoftSeq.template b/evgMrmApp/Db/evgSoftSeq.template index 6e5bd43d..57ff0051 100644 --- a/evgMrmApp/Db/evgSoftSeq.template +++ b/evgMrmApp/Db/evgSoftSeq.template @@ -22,9 +22,7 @@ record(mbbo, "$(P)TrigSrc-Sel") { field(TEST, "Software") field(ELST, "Front0") field(TVST, "Front1") - field(TTST, "Univ0") - field(FTST, "Univ1") - field(FFST, "Univ2") + field(TTST, "Front2") field(ZRVL, "0x03000000") field(ONVL, "0") field(TWVL, "1") @@ -38,49 +36,88 @@ record(mbbo, "$(P)TrigSrc-Sel") { field(TEVL, "0x01000000") field(ELVL, "0x02010000") field(TVVL, "0x02010001") - field(TTVL, "0x02020000") - field(FTVL, "0x02020001") - field(FFVL, "0x02020002") + field(TTVL, "0x02010002") info(autosaveFields_pass0, "VAL") alias("$(P)TrigSrc$(s=:)0-Sel") } record(mbbo, "$(P)TrigSrc$(s=:)1-Sel") { field(DTYP, "Raw Soft Channel") - field(OUT , "$(P)TrigSrc-Sel_ PP") + field(OUT , "$(P)TrigSrc$(s=:)-Sel_ PP") field(UDF, "0") - field(ZRST, "Univ3") - field(ONST, "Univ4") - field(TWST, "Univ5") - field(THST, "Univ6") - field(FRST, "Univ7") - field(FVST, "Univ8") - field(SXST, "Univ9") - field(SVST, "Univ10") - field(EIST, "Univ11") - field(NIST, "Univ12") - field(TEST, "Univ13") - field(ELST, "Univ14") - field(TVST, "Univ15") - field(ZRVL, "0x02020003") - field(ONVL, "0x02020004") - field(TWVL, "0x02020005") - field(THVL, "0x02020006") - field(FRVL, "0x02020007") - field(FVVL, "0x02020008") - field(SXVL, "0x02020009") - field(SVVL, "0x0202000a") - field(EIVL, "0x0202000b") - field(NIVL, "0x0202000c") - field(TEVL, "0x0202000d") - field(ELVL, "0x0202000e") - field(TVVL, "0x0202000f") + field(ZRST, "Univ0") + field(ONST, "Univ1") + field(TWST, "Univ2") + field(THST, "Univ3") + field(FRST, "Univ4") + field(FVST, "Univ5") + field(SXST, "Univ6") + field(SVST, "Univ7") + field(EIST, "Univ8") + field(NIST, "Univ9") + field(TEST, "Univ10") + field(ELST, "Univ11") + field(TVST, "Univ12") + field(TTST, "Univ13") + field(FTST, "Univ14") + field(FFST, "Univ15") + field(ZRVL, "0x02020000") + field(ONVL, "0x02020001") + field(TWVL, "0x02020002") + field(THVL, "0x02020003") + field(FRVL, "0x02020004") + field(FVVL, "0x02020005") + field(SXVL, "0x02020006") + field(SVVL, "0x02020007") + field(EIVL, "0x02020008") + field(NIVL, "0x02020009") + field(TEVL, "0x0202000a") + field(ELVL, "0x0202000b") + field(TVVL, "0x0202000c") + field(TTVL, "0x0202000d") + field(FTVL, "0x0202000e") + field(FFVL, "0x0202000f") info(autosaveFields_pass0, "VAL") } # placeholder to OPIs record(mbbo, "$(P)TrigSrc$(s=:)2-Sel") { - field(DISP, "1") + field(DTYP, "Raw Soft Channel") + field(OUT , "$(P)TrigSrc$(s=:)-Sel_ PP") + field(UDF, "0") + field(ZRST, "Rear0") + field(ONST, "Rear1") + field(TWST, "Rear2") + field(THST, "Rear3") + field(FRST, "Rear4") + field(FVST, "Rear5") + field(SXST, "Rear6") + field(SVST, "Rear7") + field(EIST, "Rear8") + field(NIST, "Rear9") + field(TEST, "Rear10") + field(ELST, "Rear11") + field(TVST, "Rear12") + field(TTST, "Rear13") + field(FTST, "Rear14") + field(FFST, "Rear15") + field(ZRVL, "0x02030000") + field(ONVL, "0x02030001") + field(TWVL, "0x02030002") + field(THVL, "0x02030003") + field(FRVL, "0x02030004") + field(FVVL, "0x02030005") + field(SXVL, "0x02030006") + field(SVVL, "0x02030007") + field(EIVL, "0x02030008") + field(NIVL, "0x02030009") + field(TEVL, "0x0203000a") + field(ELVL, "0x0203000b") + field(TVVL, "0x0203000c") + field(TTVL, "0x0203000d") + field(FTVL, "0x0203000e") + field(FFVL, "0x0203000f") + info(autosaveFields_pass0, "VAL") } record(longout, "$(P)TrigSrc-Sel_") { @@ -130,6 +167,23 @@ record(stringin, "$(P)TrigSrc-RB") { info(lutp , " 0x0202000d = Univ13") info(lutq , " 0x0202000e = Univ14") info(lutr , " 0x0202000f = Univ15") + info(luts , " 0x02010002 = Front2") + info(lutt , " 0x02030000 = Rear0") + info(lutu , " 0x02030001 = Rear1") + info(lutv , " 0x02030002 = Rear2") + info(lutw , " 0x02030003 = Rear3") + info(lutx , " 0x02030004 = Rear4") + info(luty , " 0x02030005 = Rear5") + info(lutz , " 0x02030006 = Rear6") + info(lutA , " 0x02030007 = Rear7") + info(lutB , " 0x02030008 = Rear8") + info(lutC , " 0x02030009 = Rear9") + info(lutD , " 0x0203000a = Rear10") + info(lutE , " 0x0203000b = Rear11") + info(lutF , " 0x0203000c = Rear12") + info(lutG , " 0x0203000d = Rear13") + info(lutH , " 0x0203000e = Rear14") + info(lutI , " 0x0203000f = Rear15") info(lutY , " 0x03000000 = None") }