Merge pull request #275 from licode/elastic_peak

ENH: Pileup peaks added
scikit-beam · Jun 24, 2015 · 056e586 · 056e586
2 parents fa55ede + 5a629c6
commit 056e586
Show file tree

Hide file tree

Showing 5 changed files with 347 additions and 217 deletions.
diff --git a/skxray/fitting/background.py b/skxray/fitting/background.py
@@ -56,7 +56,7 @@
 
 def snip_method(spectrum,
                 e_off, e_lin, e_quad,
-                xmin=0, xmax=2048, epsilon=2.96,
+                xmin=0, xmax=4096, epsilon=2.96,
                 width=0.5, decrease_factor=np.sqrt(2),
                 spectral_binning=None,
                 con_val=None,
@@ -178,7 +178,7 @@ def snip_method(spectrum,
         temp = (background[lo_index.astype(np.int)] +
                 background[hi_index.astype(np.int)]) / 2.
 
-        bg_index  = background > temp
+        bg_index = background > temp
         background[bg_index] = temp[bg_index]
 
     current_width = window_p
@@ -195,7 +195,7 @@ def snip_method(spectrum,
         temp = (background[lo_index.astype(np.int)] +
                 background[hi_index.astype(np.int)]) / 2.
 
-        bg_index  = background > temp
+        bg_index = background > temp
         background[bg_index] = temp[bg_index]
 
         # decrease the width and repeat

diff --git a/skxray/fitting/base/parameter_data.py b/skxray/fitting/base/parameter_data.py
@@ -237,7 +237,8 @@
         'bound_type': 'lohi',
         'description': 'Incident E [keV]',
         'max': 13.0,
-        'min': 9.0, 'value': 11.0},
+        'min': 9.0,
+        'value': 10.0},
     'compton_amplitude': {
         'bound_type': 'none',
         'max': 10000000.0,
@@ -300,7 +301,8 @@
         'min': -1e-06,
         'tool_tip': 'E(channel) = a0 + a1*channel+ a2*channel**2',
         'value': 0.0},
-    'fwhm_fanoprime': {'bound_type': 'fixed',
+    'fwhm_fanoprime': {
+        'bound_type': 'fixed',
         'description': 'fwhm Coef, b2',
         'max': 0.0001,
         'min': 1e-07,
@@ -322,7 +324,8 @@
             'value': 13.5,
             'default_value': 13.5,
             'description': 'E high [keV]'},
-        'epsilon': 3.51 # electron hole energy
+        'epsilon': 3.51,  # electron hole energy
+        "background_width": 0.5
     }
 }
 

diff --git a/skxray/fitting/models.py b/skxray/fitting/models.py
@@ -128,7 +128,7 @@ class ElasticModel(Model):
 
     def __init__(self, *args, **kwargs):
         super(ElasticModel, self).__init__(elastic, *args, **kwargs)
-        set_default(self, elastic)
+        #set_default(self, elastic)
         self.set_param_hint('epsilon', value=2.96, vary=False)
 
 
@@ -139,7 +139,7 @@ class ComptonModel(Model):
     def __init__(self, *args, **kwargs):
 
         super(ComptonModel, self).__init__(compton, *args, **kwargs)
-        set_default(self, compton)
+        #set_default(self, compton)
         self.set_param_hint('epsilon', value=2.96, vary=False)