Adds fadc2_bp parameter in load()

src/toolbox_scs/load.py

@@ -46,6 +46,7 @@ def load(proposalNB=None, runNB=None,
          extract_bam=True,
          adq412_bp='sase3',
          fadc_bp='scs_ppl',
+         fadc2_bp='sase3',
          extract_tim=None,
          extract_laser=None,
          tim_bp=None,
@@ -220,10 +221,15 @@ def load(proposalNB=None, runNB=None,
         data = tbdet.get_digitizer_peaks(run, mnemonics=adq412, merge_with=data,
                                         bunchPattern=adq412_bp)
 
-    fadc = [k for k in run_mnemonics if 'FastADC' in k and k in data]
+    fadc = [k for k in run_mnemonics if ('FastADC' in k) 
+            and ('FastADC2_' not in k) and (k in data)]
     if extract_fadc and len(fadc) > 0:
         data = tbdet.get_digitizer_peaks(run, mnemonics=fadc, merge_with=data,
                                          bunchPattern=fadc_bp)
+    fadc2 = [k for k in run_mnemonics if 'FastADC2_' in k and k in data]
+    if extract_fadc and len(fadc2) > 0:
+        data = tbdet.get_digitizer_peaks(run, mnemonics=fadc2, merge_with=data,
+                                         bunchPattern=fadc2_bp)
 
     xgm = ['XTD10_XGM', 'XTD10_XGM_sigma', 'XTD10_SA3', 'XTD10_SA3_sigma',
            'XTD10_SA1', 'XTD10_SA1_sigma', 'SCS_XGM', 'SCS_XGM_sigma',