rapidtide 3.0a7__py3-none-any.whl → 3.0a9__py3-none-any.whl

rapidtide/tidepoolTemplate_qt6.py

@@ -1,6 +1,6 @@
 # Form implementation generated from reading ui file 'tidepoolTemplate.ui'
 #
-# Created by: PyQt6 UI code generator 6.7.1
+# Created by: PyQt6 UI code generator 6.8.1
 #
 # WARNING: Any manual changes made to this file will be lost when pyuic6 is
 # run again.  Do not edit this file unless you know what you are doing.
@@ -54,7 +54,7 @@ class Ui_MainWindow(object):
         self.label.setWordWrap(True)
         self.label.setObjectName("label")
         self.layoutWidget = QtWidgets.QWidget(parent=self.imageData_groupBox)
-        self.layoutWidget.setGeometry(QtCore.QRect(10, 20, 1073, 286))
+        self.layoutWidget.setGeometry(QtCore.QRect(10, 20, 1074, 286))
         self.layoutWidget.setObjectName("layoutWidget")
         self.largeimage_horizontalLayout = QtWidgets.QHBoxLayout(self.layoutWidget)
         self.largeimage_horizontalLayout.setSizeConstraint(QtWidgets.QLayout.SizeConstraint.SetNoConstraint)
@@ -134,8 +134,15 @@ class Ui_MainWindow(object):
         self.setMask_Button = QtWidgets.QPushButton(parent=self.layoutWidget)
         self.setMask_Button.setObjectName("setMask_Button")
         self.verticalLayout_3.addWidget(self.setMask_Button)
+        self.nextFile_Button = QtWidgets.QPushButton(parent=self.layoutWidget)
+        self.nextFile_Button.setObjectName("nextFile_Button")
+        self.verticalLayout_3.addWidget(self.nextFile_Button)
         spacerItem1 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Policy.Minimum, QtWidgets.QSizePolicy.Policy.Expanding)
         self.verticalLayout_3.addItem(spacerItem1)
+        self.transparency_checkBox = QtWidgets.QCheckBox(parent=self.layoutWidget)
+        self.transparency_checkBox.setChecked(False)
+        self.transparency_checkBox.setObjectName("transparency_checkBox")
+        self.verticalLayout_3.addWidget(self.transparency_checkBox)
         self.dispmin_doubleSpinBox = QtWidgets.QDoubleSpinBox(parent=self.layoutWidget)
         self.dispmin_doubleSpinBox.setAlignment(QtCore.Qt.AlignmentFlag.AlignRight|QtCore.Qt.AlignmentFlag.AlignTrailing|QtCore.Qt.AlignmentFlag.AlignVCenter)
         self.dispmin_doubleSpinBox.setDecimals(3)
@@ -167,13 +174,13 @@ class Ui_MainWindow(object):
         self.thermal_radioButton.setObjectName("thermal_radioButton")
         self.colormap_buttonGroup.addButton(self.thermal_radioButton)
         self.colormap_verticalLayout.addWidget(self.thermal_radioButton)
-        self.GYR_radioButton = QtWidgets.QRadioButton(parent=self.layoutWidget)
+        self.plasma_radioButton = QtWidgets.QRadioButton(parent=self.layoutWidget)
         font = QtGui.QFont()
         font.setPointSize(10)
-        self.GYR_radioButton.setFont(font)
-        self.GYR_radioButton.setObjectName("GYR_radioButton")
-        self.colormap_buttonGroup.addButton(self.GYR_radioButton)
-        self.colormap_verticalLayout.addWidget(self.GYR_radioButton)
+        self.plasma_radioButton.setFont(font)
+        self.plasma_radioButton.setObjectName("plasma_radioButton")
+        self.colormap_buttonGroup.addButton(self.plasma_radioButton)
+        self.colormap_verticalLayout.addWidget(self.plasma_radioButton)
         self.rainbow_radioButton = QtWidgets.QRadioButton(parent=self.layoutWidget)
         font = QtGui.QFont()
         font.setPointSize(10)
@@ -604,7 +611,7 @@ class Ui_MainWindow(object):
         self.label_12.setObjectName("label_12")
         MainWindow.setCentralWidget(self.centralwidget)
         self.menubar = QtWidgets.QMenuBar(parent=MainWindow)
-        self.menubar.setGeometry(QtCore.QRect(0, 0, 1129, 22))
+        self.menubar.setGeometry(QtCore.QRect(0, 0, 1129, 24))
         self.menubar.setObjectName("menubar")
         MainWindow.setMenuBar(self.menubar)
         self.statusbar = QtWidgets.QStatusBar(parent=MainWindow)
@@ -626,10 +633,13 @@ class Ui_MainWindow(object):
         self.resetDispSmart_Button.setText(_translate("MainWindow", "Smart"))
         self.saveDisp_Button.setText(_translate("MainWindow", "Save"))
         self.setMask_Button.setText(_translate("MainWindow", "No mask"))
+        self.nextFile_Button.setText(_translate("MainWindow", "Next file"))
+        self.transparency_checkBox.setToolTip(_translate("MainWindow", "With transparency on, map values outside the range limits are not displayed."))
+        self.transparency_checkBox.setText(_translate("MainWindow", "Transparency"))
         self.label_2.setText(_translate("MainWindow", "Colormap"))
         self.gray_radioButton.setText(_translate("MainWindow", "Gray"))
         self.thermal_radioButton.setText(_translate("MainWindow", "Thermal"))
-        self.GYR_radioButton.setText(_translate("MainWindow", "GYR"))
+        self.plasma_radioButton.setText(_translate("MainWindow", "Plasma"))
         self.rainbow_radioButton.setText(_translate("MainWindow", "Rainbow"))
         self.viridis_radioButton.setText(_translate("MainWindow", "Viridis"))
         self.turbo_radioButton.setText(_translate("MainWindow", "Turbo"))

rapidtide/workflows/rapidtide.py

@@ -1968,11 +1968,13 @@ def rapidtide_main(argparsingfunc):
         if optiondict["check_autocorrelation"]:
             LGR.info("checking reference regressor autocorrelation properties")
             optiondict["lagmod"] = 1000.0
-            lagindpad = corrorigin - 2 * np.max((lagmininpts, lagmaxinpts))
-            acmininpts = lagmininpts + lagindpad
-            acmaxinpts = lagmaxinpts + lagindpad
+            lagindpad = np.max((lagmininpts, lagmaxinpts))
+            acmininpts = lagindpad
+            acmaxinpts = lagindpad
             theCorrelator.setreftc(referencetc)
             theCorrelator.setlimits(acmininpts, acmaxinpts)
+            # theCorrelator.setlimits(lagmininpts, lagmaxinpts)
+            print("check_autocorrelation:", acmininpts, acmaxinpts, lagmininpts, lagmaxinpts)
             thexcorr, accheckcorrscale, dummy = theCorrelator.run(
                 resampref_y[osvalidsimcalcstart : osvalidsimcalcend + 1]
             )
@@ -2156,7 +2158,8 @@ def rapidtide_main(argparsingfunc):
             theMutualInformationator.setreftc(cleaned_resampref_y)
             dummy, trimmedcorrscale, dummy = theCorrelator.getfunction()
             thefitter.setcorrtimeaxis(trimmedcorrscale)
-            # add parallel path for mutualinformationator BBF
+
+            # parallel path for mutual information
             if optiondict["similaritymetric"] == "mutualinfo":
                 theSimFunc = theMutualInformationator
             else:
@@ -3838,7 +3841,7 @@ def rapidtide_main(argparsingfunc):
         (fitmask, "corrfit", "mask", None, "Voxels where correlation value was fit"),
         (failreason, "corrfitfailreason", "info", None, "Result codes for correlation fit"),
     ]
-    MTT = np.square(lagsigma) - (optiondict["acwidth"] * optiondict["acwidth"])
+    MTT = np.square(lagsigma) - 0.5 * (optiondict["acwidth"] * optiondict["acwidth"])
     MTT = np.where(MTT > 0.0, MTT, 0.0)
     MTT = np.sqrt(MTT)
     savelist += [(MTT, "MTT", "map", "second", "Mean transit time (estimated)")]