v6.28

Author: PBrockmann

PyAnalySeries.py

@@ -58,7 +58,7 @@
     filesName = None
 
 #========================================================================================
-version = 'v6.27'
+version = 'v6.28'
 
 open_ws = {}
 open_displayWindows = {} 

environment_PyQt5.yml

@@ -14,5 +14,5 @@ dependencies:
   - pyproj
   - pip
   - pip:
-    - inso==0.7.0
+    - inso==1.2.0
     - pyleoclim==1.3.0

environment_PyQt6.yml

@@ -14,5 +14,5 @@ dependencies:
   - pyproj
   - pip
   - pip:
-    - inso==0.7.0
+    - inso==1.2.0
     - pyleoclim==1.3.0

releases.md

@@ -1,5 +1,9 @@
+ * 6.28
+   * Update inso to v1.2.0 in conda environments
+   * Preserve replicate variability when compute Detrend
  * 6.27
    * Add Qt compatibility layer (PyQt5 / PyQt6)
+   * Add Qt compatibility layer (PyQt5 / PyQt6)
  * 6.26
    * Fix in defineInsolation, Eccentricity and Precession parameter are dimensionless
    * Factorize astro/insolation computations from defineInsolationAstroSeriesWindow into a shared module insolationAstroSeries.py

resources/computeDetrendWindow.py

@@ -259,8 +259,9 @@ def myplot(self, limits=None):
         self.seriesDict = self.item.data(0, Qt.ItemDataRole.UserRole)
         self.xName = self.seriesDict['X']
         self.yName = self.seriesDict['Y']
-        self.series = self.seriesDict['Series']
-        self.series = self.series.groupby(self.series.index).mean()
+
+        self.series_raw = self.seriesDict['Series']
+        self.series = self.series_raw.groupby(self.series_raw.index).mean()
 
         ax = self.interactive_plot.axs[0]
 
@@ -293,6 +294,12 @@ def myplot(self, limits=None):
         )
 
         self.seriesDetrended = pd.Series(ts_dt.value, index=ts_dt.time)
+
+        mean_raw_aligned = self.series.reindex(self.series_raw.index)
+        mean_dt_aligned = self.seriesDetrended.reindex(self.series_raw.index)
+
+        self.seriesDetrended_raw = self.series_raw - mean_raw_aligned + mean_dt_aligned
+
         seriesColor = self.seriesDict['Color']
 
         line1, = ax.plot(self.series.index, self.series.values, color=seriesColor, linewidth=self.seriesWidth, label='Original')
@@ -325,7 +332,7 @@ def saveSeriesDetrended(self):
 
         detrended_seriesDict = self.seriesDict | {'Id': detrended_Id,
             'Type': 'Series detrended', 
-            'Series': self.seriesDetrended,
+            'Series': self.seriesDetrended_raw,
             'Color': generate_color(exclude_color=self.seriesDict['Color']),
             'Date': datetime.datetime.now().strftime("Created %Y/%m/%d at %H:%M:%S"),
             'History': append_to_htmlText(self.seriesDict['History'], history),