feat: set 'FLUORESCENCE SPECTRUM' as emission layout (#122) (#123)

ComPlat · Aug 10, 2023 · 8623246 · 8623246
1 parent d315101
commit 8623246
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/chem_spectra/lib/converter/jcamp/base.py b/chem_spectra/lib/converter/jcamp/base.py
@@ -75,7 +75,7 @@ def __set_datatype(self):
             return 'CIRCULAR DICHROISM SPECTROSCOPY'
         elif 'SORPTION-DESORPTION MEASUREMENT' in dts:
             return 'SORPTION-DESORPTION MEASUREMENT'
-        elif 'Emissions' in dts or 'EMISSIONS' in dts:
+        elif 'Emissions' in dts or 'EMISSIONS' in dts or 'FLUORESCENCE SPECTRUM' in dts:
             return 'Emissions'
         elif 'DLS ACF' in dts:
             return 'DLS ACF'
@@ -113,7 +113,7 @@ def __typ(self):
             return 'CIRCULAR DICHROISM SPECTROSCOPY'
         elif 'SORPTION-DESORPTION MEASUREMENT' in dt:
             return 'SORPTION-DESORPTION MEASUREMENT'
-        elif 'Emissions' in dt or 'EMISSIONS' in dt:
+        elif 'Emissions' in dt or 'EMISSIONS' in dt or 'FLUORESCENCE SPECTRUM' in dt:
             return 'Emissions'
         elif 'DLS ACF' in dt:
             return 'DLS ACF'
@@ -175,7 +175,7 @@ def __is_aif(self):
         return self.typ in ['SORPTION-DESORPTION MEASUREMENT']
 
     def __is_emissions(self):
-        return self.typ in ['Emissions', 'EMISSIONS']
+        return self.typ in ['Emissions', 'EMISSIONS', 'FLUORESCENCE SPECTRUM']
 
     def __is_dls_acf(self):
         return self.typ in ['DLS ACF']

diff --git a/chem_spectra/lib/converter/jcamp/ni.py b/chem_spectra/lib/converter/jcamp/ni.py
@@ -95,7 +95,7 @@ def __thres(self):
         elif dt in ['X-RAY DIFFRACTION', 'CIRCULAR DICHROISM SPECTROSCOPY', 'CYCLIC VOLTAMMETRY', 'SORPTION-DESORPTION MEASUREMENT', 
                     'DLS INTENSITY', 'DLS intensity']:
             return THRESHOLD_XRD
-        elif dt in ['Emissions', 'EMISSIONS']:
+        elif dt in ['Emissions', 'EMISSIONS', 'FLUORESCENCE SPECTRUM']:
             return THRESHOLD_EMISSION
         return 0.5
 
@@ -108,7 +108,7 @@ def __index_target(self):
             'THERMOGRAVIMETRIC ANALYSIS', 'X-RAY DIFFRACTION',
             'CYCLIC VOLTAMMETRY', 'SIZE EXCLUSION CHROMATOGRAPHY',
             'CIRCULAR DICHROISM SPECTROSCOPY', 'SORPTION-DESORPTION MEASUREMENT',
-            'Emissions', 'EMISSIONS', 'DLS ACF', 'DLS INTENSITY', 'DLS intensity'
+            'Emissions', 'EMISSIONS', 'FLUORESCENCE SPECTRUM', 'DLS ACF', 'DLS INTENSITY', 'DLS intensity'
         ]
         for tp in target_topics:
             if tp in self.datatypes:

diff --git a/setup.py b/setup.py
@@ -6,7 +6,7 @@
 
 setup(
     name='chem-spectra-app',
-    version='0.13.1',
+    version='0.13.2',
     packages=find_packages(),
     include_package_data=True,
     zip_safe=False,