From b86475a6729d99124c76468b17807f5818c303e4 Mon Sep 17 00:00:00 2001 From: l_maliakal_d Date: Thu, 16 May 2013 14:34:04 +0000 Subject: [PATCH] removed settings and trimdir directories and only settingsdir for all detectors git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorsPackage@54 08cae9ef-cb74-4d14-b03a-d7ea46f178d7 --- .../gotthard}/dynamicgain/calibration.sn | 0 .../gotthard}/dynamicgain/settings.sn | 0 .../gotthard}/highgain/calibration.sn | 0 {settings => settingsdir/gotthard}/highgain/settings.sn | 0 {settings => settingsdir/gotthard}/lowgain/calibration.sn | 0 {settings => settingsdir/gotthard}/lowgain/settings.sn | 0 .../gotthard}/mediumgain/calibration.sn | 0 {settings => settingsdir/gotthard}/mediumgain/settings.sn | 0 .../gotthard}/veryhighgain/calibration.sn | 0 .../gotthard}/veryhighgain/settings.sn | 0 settingsdir/moench/dynamicgain/calibration.sn | 1 + settingsdir/moench/dynamicgain/settings.sn | 8 ++++++++ settingsdir/moench/highgain/calibration.sn | 1 + settingsdir/moench/highgain/settings.sn | 8 ++++++++ settingsdir/moench/lowgain/calibration.sn | 1 + settingsdir/moench/lowgain/settings.sn | 8 ++++++++ settingsdir/moench/mediumgain/calibration.sn | 1 + settingsdir/moench/mediumgain/settings.sn | 8 ++++++++ settingsdir/moench/veryhighgain/calibration.sn | 1 + settingsdir/moench/veryhighgain/settings.sn | 8 ++++++++ {trimdir => settingsdir/mythen}/fast/calibration.snxxx | 0 {trimdir => settingsdir/mythen}/fast/fast.cal | 0 {trimdir => settingsdir/mythen}/fast/fast.trim | 0 {trimdir => settingsdir/mythen}/fast/noise.snxxx | 0 .../mythen}/highgain/calibration.snxxx | 0 {trimdir => settingsdir/mythen}/highgain/highgain.cal | 0 {trimdir => settingsdir/mythen}/highgain/highgain.trim | 0 {trimdir => settingsdir/mythen}/highgain/noise.snxxx | 0 .../mythen}/standard/calibration.snxxx | 0 {trimdir => settingsdir/mythen}/standard/noise.snxxx | 0 {trimdir => settingsdir/mythen}/standard/standard.cal | 0 {trimdir => settingsdir/mythen}/standard/standard.trim | 0 32 files changed, 45 insertions(+) rename {settings => settingsdir/gotthard}/dynamicgain/calibration.sn (100%) rename {settings => settingsdir/gotthard}/dynamicgain/settings.sn (100%) rename {settings => settingsdir/gotthard}/highgain/calibration.sn (100%) rename {settings => settingsdir/gotthard}/highgain/settings.sn (100%) rename {settings => settingsdir/gotthard}/lowgain/calibration.sn (100%) rename {settings => settingsdir/gotthard}/lowgain/settings.sn (100%) rename {settings => settingsdir/gotthard}/mediumgain/calibration.sn (100%) rename {settings => settingsdir/gotthard}/mediumgain/settings.sn (100%) rename {settings => settingsdir/gotthard}/veryhighgain/calibration.sn (100%) rename {settings => settingsdir/gotthard}/veryhighgain/settings.sn (100%) create mode 100755 settingsdir/moench/dynamicgain/calibration.sn create mode 100755 settingsdir/moench/dynamicgain/settings.sn create mode 100644 settingsdir/moench/highgain/calibration.sn create mode 100644 settingsdir/moench/highgain/settings.sn create mode 100644 settingsdir/moench/lowgain/calibration.sn create mode 100644 settingsdir/moench/lowgain/settings.sn create mode 100644 settingsdir/moench/mediumgain/calibration.sn create mode 100644 settingsdir/moench/mediumgain/settings.sn create mode 100644 settingsdir/moench/veryhighgain/calibration.sn create mode 100644 settingsdir/moench/veryhighgain/settings.sn rename {trimdir => settingsdir/mythen}/fast/calibration.snxxx (100%) rename {trimdir => settingsdir/mythen}/fast/fast.cal (100%) rename {trimdir => settingsdir/mythen}/fast/fast.trim (100%) rename {trimdir => settingsdir/mythen}/fast/noise.snxxx (100%) rename {trimdir => settingsdir/mythen}/highgain/calibration.snxxx (100%) rename {trimdir => settingsdir/mythen}/highgain/highgain.cal (100%) rename {trimdir => settingsdir/mythen}/highgain/highgain.trim (100%) rename {trimdir => settingsdir/mythen}/highgain/noise.snxxx (100%) rename {trimdir => settingsdir/mythen}/standard/calibration.snxxx (100%) rename {trimdir => settingsdir/mythen}/standard/noise.snxxx (100%) rename {trimdir => settingsdir/mythen}/standard/standard.cal (100%) rename {trimdir => settingsdir/mythen}/standard/standard.trim (100%) diff --git a/settings/dynamicgain/calibration.sn b/settingsdir/gotthard/dynamicgain/calibration.sn similarity index 100% rename from settings/dynamicgain/calibration.sn rename to settingsdir/gotthard/dynamicgain/calibration.sn diff --git a/settings/dynamicgain/settings.sn b/settingsdir/gotthard/dynamicgain/settings.sn similarity index 100% rename from settings/dynamicgain/settings.sn rename to settingsdir/gotthard/dynamicgain/settings.sn diff --git a/settings/highgain/calibration.sn b/settingsdir/gotthard/highgain/calibration.sn similarity index 100% rename from settings/highgain/calibration.sn rename to settingsdir/gotthard/highgain/calibration.sn diff --git a/settings/highgain/settings.sn b/settingsdir/gotthard/highgain/settings.sn similarity index 100% rename from settings/highgain/settings.sn rename to settingsdir/gotthard/highgain/settings.sn diff --git a/settings/lowgain/calibration.sn b/settingsdir/gotthard/lowgain/calibration.sn similarity index 100% rename from settings/lowgain/calibration.sn rename to settingsdir/gotthard/lowgain/calibration.sn diff --git a/settings/lowgain/settings.sn b/settingsdir/gotthard/lowgain/settings.sn similarity index 100% rename from settings/lowgain/settings.sn rename to settingsdir/gotthard/lowgain/settings.sn diff --git a/settings/mediumgain/calibration.sn b/settingsdir/gotthard/mediumgain/calibration.sn similarity index 100% rename from settings/mediumgain/calibration.sn rename to settingsdir/gotthard/mediumgain/calibration.sn diff --git a/settings/mediumgain/settings.sn b/settingsdir/gotthard/mediumgain/settings.sn similarity index 100% rename from settings/mediumgain/settings.sn rename to settingsdir/gotthard/mediumgain/settings.sn diff --git a/settings/veryhighgain/calibration.sn b/settingsdir/gotthard/veryhighgain/calibration.sn similarity index 100% rename from settings/veryhighgain/calibration.sn rename to settingsdir/gotthard/veryhighgain/calibration.sn diff --git a/settings/veryhighgain/settings.sn b/settingsdir/gotthard/veryhighgain/settings.sn similarity index 100% rename from settings/veryhighgain/settings.sn rename to settingsdir/gotthard/veryhighgain/settings.sn diff --git a/settingsdir/moench/dynamicgain/calibration.sn b/settingsdir/moench/dynamicgain/calibration.sn new file mode 100755 index 000000000..e5a59be31 --- /dev/null +++ b/settingsdir/moench/dynamicgain/calibration.sn @@ -0,0 +1 @@ +227 5.6 diff --git a/settingsdir/moench/dynamicgain/settings.sn b/settingsdir/moench/dynamicgain/settings.sn new file mode 100755 index 000000000..c9e071c7c --- /dev/null +++ b/settingsdir/moench/dynamicgain/settings.sn @@ -0,0 +1,8 @@ +VDAC0 660 +VDAC1 650 +VDAC2 1480 +VDAC3 1520 +VDAC4 1320 +VDAC5 1350 +VDAC6 887 +VDAC7 2001 diff --git a/settingsdir/moench/highgain/calibration.sn b/settingsdir/moench/highgain/calibration.sn new file mode 100644 index 000000000..e5a59be31 --- /dev/null +++ b/settingsdir/moench/highgain/calibration.sn @@ -0,0 +1 @@ +227 5.6 diff --git a/settingsdir/moench/highgain/settings.sn b/settingsdir/moench/highgain/settings.sn new file mode 100644 index 000000000..c9e071c7c --- /dev/null +++ b/settingsdir/moench/highgain/settings.sn @@ -0,0 +1,8 @@ +VDAC0 660 +VDAC1 650 +VDAC2 1480 +VDAC3 1520 +VDAC4 1320 +VDAC5 1350 +VDAC6 887 +VDAC7 2001 diff --git a/settingsdir/moench/lowgain/calibration.sn b/settingsdir/moench/lowgain/calibration.sn new file mode 100644 index 000000000..e5a59be31 --- /dev/null +++ b/settingsdir/moench/lowgain/calibration.sn @@ -0,0 +1 @@ +227 5.6 diff --git a/settingsdir/moench/lowgain/settings.sn b/settingsdir/moench/lowgain/settings.sn new file mode 100644 index 000000000..c9e071c7c --- /dev/null +++ b/settingsdir/moench/lowgain/settings.sn @@ -0,0 +1,8 @@ +VDAC0 660 +VDAC1 650 +VDAC2 1480 +VDAC3 1520 +VDAC4 1320 +VDAC5 1350 +VDAC6 887 +VDAC7 2001 diff --git a/settingsdir/moench/mediumgain/calibration.sn b/settingsdir/moench/mediumgain/calibration.sn new file mode 100644 index 000000000..e5a59be31 --- /dev/null +++ b/settingsdir/moench/mediumgain/calibration.sn @@ -0,0 +1 @@ +227 5.6 diff --git a/settingsdir/moench/mediumgain/settings.sn b/settingsdir/moench/mediumgain/settings.sn new file mode 100644 index 000000000..c9e071c7c --- /dev/null +++ b/settingsdir/moench/mediumgain/settings.sn @@ -0,0 +1,8 @@ +VDAC0 660 +VDAC1 650 +VDAC2 1480 +VDAC3 1520 +VDAC4 1320 +VDAC5 1350 +VDAC6 887 +VDAC7 2001 diff --git a/settingsdir/moench/veryhighgain/calibration.sn b/settingsdir/moench/veryhighgain/calibration.sn new file mode 100644 index 000000000..66fd0867d --- /dev/null +++ b/settingsdir/moench/veryhighgain/calibration.sn @@ -0,0 +1 @@ +227 5.6 \ No newline at end of file diff --git a/settingsdir/moench/veryhighgain/settings.sn b/settingsdir/moench/veryhighgain/settings.sn new file mode 100644 index 000000000..c9e071c7c --- /dev/null +++ b/settingsdir/moench/veryhighgain/settings.sn @@ -0,0 +1,8 @@ +VDAC0 660 +VDAC1 650 +VDAC2 1480 +VDAC3 1520 +VDAC4 1320 +VDAC5 1350 +VDAC6 887 +VDAC7 2001 diff --git a/trimdir/fast/calibration.snxxx b/settingsdir/mythen/fast/calibration.snxxx similarity index 100% rename from trimdir/fast/calibration.snxxx rename to settingsdir/mythen/fast/calibration.snxxx diff --git a/trimdir/fast/fast.cal b/settingsdir/mythen/fast/fast.cal similarity index 100% rename from trimdir/fast/fast.cal rename to settingsdir/mythen/fast/fast.cal diff --git a/trimdir/fast/fast.trim b/settingsdir/mythen/fast/fast.trim similarity index 100% rename from trimdir/fast/fast.trim rename to settingsdir/mythen/fast/fast.trim diff --git a/trimdir/fast/noise.snxxx b/settingsdir/mythen/fast/noise.snxxx similarity index 100% rename from trimdir/fast/noise.snxxx rename to settingsdir/mythen/fast/noise.snxxx diff --git a/trimdir/highgain/calibration.snxxx b/settingsdir/mythen/highgain/calibration.snxxx similarity index 100% rename from trimdir/highgain/calibration.snxxx rename to settingsdir/mythen/highgain/calibration.snxxx diff --git a/trimdir/highgain/highgain.cal b/settingsdir/mythen/highgain/highgain.cal similarity index 100% rename from trimdir/highgain/highgain.cal rename to settingsdir/mythen/highgain/highgain.cal diff --git a/trimdir/highgain/highgain.trim b/settingsdir/mythen/highgain/highgain.trim similarity index 100% rename from trimdir/highgain/highgain.trim rename to settingsdir/mythen/highgain/highgain.trim diff --git a/trimdir/highgain/noise.snxxx b/settingsdir/mythen/highgain/noise.snxxx similarity index 100% rename from trimdir/highgain/noise.snxxx rename to settingsdir/mythen/highgain/noise.snxxx diff --git a/trimdir/standard/calibration.snxxx b/settingsdir/mythen/standard/calibration.snxxx similarity index 100% rename from trimdir/standard/calibration.snxxx rename to settingsdir/mythen/standard/calibration.snxxx diff --git a/trimdir/standard/noise.snxxx b/settingsdir/mythen/standard/noise.snxxx similarity index 100% rename from trimdir/standard/noise.snxxx rename to settingsdir/mythen/standard/noise.snxxx diff --git a/trimdir/standard/standard.cal b/settingsdir/mythen/standard/standard.cal similarity index 100% rename from trimdir/standard/standard.cal rename to settingsdir/mythen/standard/standard.cal diff --git a/trimdir/standard/standard.trim b/settingsdir/mythen/standard/standard.trim similarity index 100% rename from trimdir/standard/standard.trim rename to settingsdir/mythen/standard/standard.trim