diff --git a/utcaApp/Db/Makefile b/utcaApp/Db/Makefile index 978fd3a..ec68258 100644 --- a/utcaApp/Db/Makefile +++ b/utcaApp/Db/Makefile @@ -10,7 +10,7 @@ DB += scan_task.template DB += acq.template raw_data.template acq.substitutions DB += ad9510.template DB += afc_timing.template afc_timing_clock.template afc_timing_trigger.template afc_timing.substitutions -DB += bpm_data.template bpm_data.substitutions +DB += bpm_data.template bpm_pos_data.template bpm_data.substitutions DB += bpm_swap.template bpm_swap.substitutions DB += fmc_active_clk.template fmc_active_clk.substitutions DB += fmc_adc_common.template fmc_adc_common.substitutions diff --git a/utcaApp/Db/bpm_data.substitutions b/utcaApp/Db/bpm_data.substitutions index 13cb459..80ec24f 100644 --- a/utcaApp/Db/bpm_data.substitutions +++ b/utcaApp/Db/bpm_data.substitutions @@ -5,3 +5,7 @@ file db/bpm_data.template { {"C", 2} {"D", 3} } + +file db/bpm_pos_data.template { + {} +} diff --git a/utcaApp/Db/bpm_pos_data.template b/utcaApp/Db/bpm_pos_data.template new file mode 100644 index 0000000..516578c --- /dev/null +++ b/utcaApp/Db/bpm_pos_data.template @@ -0,0 +1,69 @@ +record(aai,"$(P)$(R)$(ACQ_NAME)PosXData") { + field(EGU, "nm") + field(NELM, "$(NELM)") + field(FTVL, "DOUBLE") + alias("$(P)$(R)$(ACQ_NAME)_XArrayData") +} + +record(aai,"$(P)$(R)$(ACQ_NAME)PosYData") { + field(EGU, "nm") + field(NELM, "$(NELM)") + field(FTVL, "DOUBLE") + alias("$(P)$(R)$(ACQ_NAME)_YArrayData") +} + +record(aai,"$(P)$(R)$(ACQ_NAME)SumData") { + field(EGU, "au") + field(NELM, "$(NELM)") + field(FTVL, "DOUBLE") + alias("$(P)$(R)$(ACQ_NAME)_SUMArrayData") +} + +record(aai,"$(P)$(R)$(ACQ_NAME)PosQData") { + field(EGU, "nm") + field(NELM, "$(NELM)") + field(FTVL, "DOUBLE") + alias("$(P)$(R)$(ACQ_NAME)_QArrayData") +} + +record(aSub, "$(P)$(R)$(ACQ_NAME)Calc"){ + field(SNAM, "asub_pos_calc") + field(INPA, "$(P)$(R)$(ACQ_NAME)AmplAData") + field(FTA, "LONG") + field(NOA, "$(NELM)") + field(INPB, "$(P)$(R)$(ACQ_NAME)AmplBData") + field(FTB, "LONG") + field(NOB, "$(NELM)") + field(INPC, "$(P)$(R)$(ACQ_NAME)AmplCData") + field(FTC, "LONG") + field(NOC, "$(NELM)") + field(INPD, "$(P)$(R)$(ACQ_NAME)AmplDData CP") + field(FTD, "LONG") + field(NOD, "$(NELM)") + field(INPE, "$(P)$(R)PosXOffset-RB") + field(FTE, "LONG") + field(INPF, "$(P)$(R)PosKx-RB") + field(FTF, "DOUBLE") + field(INPG, "$(P)$(R)PosYOffset-RB") + field(FTG, "LONG") + field(INPH, "$(P)$(R)PosKy-RB") + field(FTH, "DOUBLE") + field(INPI, "$(P)$(R)PosKsum-RB") + field(FTI, "DOUBLE") + field(INPJ, "$(P)$(R)PosQOffset-RB") + field(FTJ, "DOUBLE") + field(INPK, "$(P)$(R)PosKq-RB") + field(FTK, "DOUBLE") + field(OUTA, "$(P)$(R)$(ACQ_NAME)PosXData PP") + field(FTVA, "DOUBLE") + field(NOVA, "$(NELM)") + field(OUTB, "$(P)$(R)$(ACQ_NAME)PosYData PP") + field(FTVB, "DOUBLE") + field(NOVB, "$(NELM)") + field(OUTC, "$(P)$(R)$(ACQ_NAME)SumData PP") + field(FTVC, "DOUBLE") + field(NOVC, "$(NELM)") + field(OUTD, "$(P)$(R)$(ACQ_NAME)PosQData PP") + field(FTVD, "DOUBLE") + field(NOVD, "$(NELM)") +}