Merge pull request #11 from Bayer-Group/m-lueb-patch-1

m-lueb · web-flow · commit 1396089e2d75 · 2025-01-06T11:28:51.000+01:00
Updated dataset.py
diff --git a/src/mocca2/dataset/dataset.py b/src/mocca2/dataset/dataset.py
@@ -568,7 +568,7 @@ def get_concentrations(self) -> Tuple[pd.DataFrame, List[int]]:
                 column_names.append(name)
                 columns.append(
                     [
-                        None if c_id not in ints else ints[c_id] * conc_factor
+                        None if c_id not in ints or ints[c_id] is None else ints[c_id] * conc_factor
                         for ints in integrals
                     ]
                 )
@@ -640,7 +640,7 @@ def get_relative_concentrations(self) -> Tuple[pd.DataFrame, List[int]]:
                 column_names.append(name)
                 columns.append(
                     [
-                        None if c_id not in ints else ints[c_id] * conc_factor
+                        None if c_id not in ints or ints[c_id] is None else ints[c_id] * conc_factor
                         for ints in integrals
                     ]
                 )

Original file line number	Diff line number	Diff line change
`@@ -568,7 +568,7 @@ def get_concentrations(self) -> Tuple[pd.DataFrame, List[int]]:`
`568`	`568`	`column_names.append(name)`
`569`	`569`	`columns.append(`
`570`	`570`	`[`
`571`		`- None if c_id not in ints else ints[c_id] * conc_factor`
	`571`	`+ None if c_id not in ints or ints[c_id] is None else ints[c_id] * conc_factor`
`572`	`572`	`for ints in integrals`
`573`	`573`	`]`
`574`	`574`	`)`
`@@ -640,7 +640,7 @@ def get_relative_concentrations(self) -> Tuple[pd.DataFrame, List[int]]:`
`640`	`640`	`column_names.append(name)`
`641`	`641`	`columns.append(`
`642`	`642`	`[`
`643`		`- None if c_id not in ints else ints[c_id] * conc_factor`
	`643`	`+ None if c_id not in ints or ints[c_id] is None else ints[c_id] * conc_factor`
`644`	`644`	`for ints in integrals`
`645`	`645`	`]`
`646`	`646`	`)`