Finish renaming fields in loader.py and plottter.py

Photon-HDF5 · Jun 15, 2015 · bd4032d · bd4032d
1 parent f9c3a53
commit bd4032d
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/phconvert/loader.py b/phconvert/loader.py
@@ -51,8 +51,8 @@ def usalex_sm(
             measurement_type = 'smFRET-usALEX',
             alex_period = alex_period,
             alex_offset = alex_offset,
-            alex_period_excitation1 = alex_period_donor,
-            alex_period_excitation2 = alex_period_acceptor,
+            alex_excitation_period1 = alex_period_donor,
+            alex_excitation_period2 = alex_period_acceptor,
             detectors_specs = dict(spectral_ch1 = donor,
                                    spectral_ch2 = acceptor))
     )
@@ -160,8 +160,8 @@ def nsalex_bh(filename_spc,
         measurement_specs = dict(
             measurement_type = 'smFRET-nsALEX',
             laser_repetition_rate = laser_repetition_rate,
-            alex_period_excitation1 = alex_period_donor,
-            alex_period_excitation2 = alex_period_acceptor,
+            alex_excitation_period1 = alex_period_donor,
+            alex_excitation_period2 = alex_period_acceptor,
             detectors_specs = dict(spectral_ch1 = donor,
                                    spectral_ch2 = acceptor)),
     )
@@ -241,8 +241,8 @@ def nsalex_ht3(filename,
         measurement_specs = dict(
             measurement_type = 'smFRET-nsALEX',
             laser_repetition_rate = laser_repetition_rate,
-            alex_period_excitation1 = alex_period_donor,
-            alex_period_excitation2 = alex_period_acceptor,
+            alex_excitation_period1 = alex_period_donor,
+            alex_excitation_period2 = alex_period_acceptor,
             detectors_specs = dict(spectral_ch1 = donor,
                                    spectral_ch2 = acceptor)),
     )

diff --git a/phconvert/plotter.py b/phconvert/plotter.py
@@ -54,8 +54,8 @@ def alternation_hist_usalex(d, bins=None, ax=None,
 
     d_em_t = (det_t == d_ch)
     a_em_t = (det_t == a_ch)
-    D_ON = ph_data['measurement_specs']['alex_period_excitation1']
-    A_ON = ph_data['measurement_specs']['alex_period_excitation2']
+    D_ON = ph_data['measurement_specs']['alex_excitation_period1']
+    A_ON = ph_data['measurement_specs']['alex_excitation_period2']
     offset = ph_data['measurement_specs']['alex_offset']
     D_label = 'Donor: %d-%d' % (D_ON[0], D_ON[1])
     A_label = 'Accept: %d-%d' % (A_ON[0], A_ON[1])
@@ -103,8 +103,8 @@ def alternation_hist_nsalex(d, bins=None, ax=None):
     d_ch =  det_specs['spectral_ch1']
     a_ch =  det_specs['spectral_ch2']
 
-    D_ON = ph_data['measurement_specs']['alex_period_excitation1']
-    A_ON = ph_data['measurement_specs']['alex_period_excitation2']
+    D_ON = ph_data['measurement_specs']['alex_excitation_period1']
+    A_ON = ph_data['measurement_specs']['alex_excitation_period2']
 
     D_label = 'Donor: %d-%d' % (D_ON[0], D_ON[1])
     A_label = 'Accept: %d-%d' % (A_ON[0], A_ON[1])