Merge branch 'fast_adc_dim' into 'master'

renames FastADC raw dim from samplesId to fadc_samplesId

See merge request !49

Load.py

@@ -292,61 +292,61 @@ mnemonics = {
                 'dim':['peakId']},
     "FastADC0raw": {'source':'SCS_UTC1_MCP/ADC/1:channel_0.output',
                 'key':'data.rawData',
-                'dim':['samplesId']},
+                'dim':['fadc_samplesId']},
     "FastADC1peaks": {'source':'SCS_UTC1_MCP/ADC/1:channel_1.output',
                 'key':'data.peaks',
                 'dim':['peakId']},
     "FastADC1raw": {'source':'SCS_UTC1_MCP/ADC/1:channel_1.output',
                 'key':'data.rawData',
-                'dim':['samplesId']},
+                'dim':['fadc_samplesId']},
     "FastADC2peaks": {'source':'SCS_UTC1_MCP/ADC/1:channel_2.output',
                 'key':'data.peaks',
                 'dim':['peakId']},
     "FastADC2raw": {'source':'SCS_UTC1_MCP/ADC/1:channel_2.output',
                 'key':'data.rawData',
-                'dim':['samplesId']},
+                'dim':['fadc_samplesId']},
     "FastADC3peaks": {'source':'SCS_UTC1_MCP/ADC/1:channel_3.output',
                 'key':'data.peaks',
                 'dim':['peakId']},
     "FastADC3raw": {'source':'SCS_UTC1_MCP/ADC/1:channel_3.output',
                 'key':'data.rawData',
-                'dim':['samplesId']},
+                'dim':['fadc_samplesId']},
     "FastADC4peaks": {'source':'SCS_UTC1_MCP/ADC/1:channel_4.output',
                 'key':'data.peaks',
                 'dim':['peakId']},
     "FastADC4raw": {'source':'SCS_UTC1_MCP/ADC/1:channel_4.output',
                 'key':'data.rawData',
-                'dim':['samplesId']},
+                'dim':['fadc_samplesId']},
     "FastADC5peaks": {'source':'SCS_UTC1_MCP/ADC/1:channel_5.output',
                 'key':'data.peaks',
                 'dim':['peakId']},
     "FastADC5raw": {'source':'SCS_UTC1_MCP/ADC/1:channel_5.output',
                 'key':'data.rawData',
-                'dim':['samplesId']},
+                'dim':['fadc_samplesId']},
     "FastADC6peaks": {'source':'SCS_UTC1_MCP/ADC/1:channel_6.output',
                 'key':'data.peaks',
                 'dim':['peakId']},
     "FastADC6raw": {'source':'SCS_UTC1_MCP/ADC/1:channel_6.output',
                 'key':'data.rawData',
-                'dim':['samplesId']},
+                'dim':['fadc_samplesId']},
     "FastADC7peaks": {'source':'SCS_UTC1_MCP/ADC/1:channel_7.output',
                 'key':'data.peaks',
                 'dim':['peakId']},
     "FastADC7raw": {'source':'SCS_UTC1_MCP/ADC/1:channel_7.output',
                 'key':'data.rawData',
-                'dim':['samplesId']},
+                'dim':['fadc_samplesId']},
     "FastADC8peaks": {'source':'SCS_UTC1_MCP/ADC/1:channel_8.output',
                 'key':'data.peaks',
                 'dim':['peakId']},
     "FastADC8raw": {'source':'SCS_UTC1_MCP/ADC/1:channel_8.output',
                 'key':'data.rawData',
-                'dim':['samplesId']},
+                'dim':['fadc_samplesId']},
     "FastADC9peaks": {'source':'SCS_UTC1_MCP/ADC/1:channel_9.output',
                 'key':'data.peaks',
                 'dim':['peakId']},
     "FastADC9raw": {'source':'SCS_UTC1_MCP/ADC/1:channel_9.output',
                 'key':'data.rawData',
-                'dim':['samplesId']},
+                'dim':['fadc_samplesId']},
 
     # KARABACON
     "KARABACON": {'source':'SCS_DAQ_SCAN/MDL/KARABACON',