Tibeuleu/FOC_Reduction
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix mid-merge plots.py

Browse Source
This commit is contained in:
Thibault Barnouin
2025-05-13 15:09:48 +02:00
parent ba7b4e23ae
commit bce319581c
1 changed files with 0 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
package/lib/plots.py
View File

@@ -3084,15 +3084,9 @@ class pol_map(object):
label = r"$P \cdot F_{\lambda}$ [$ergs \cdot cm^{-2} \cdot s^{-1} \cdot \AA^{-1}$]"
elif self.display_selection.lower() in ["pol_deg"]:
self.data = self.P * 100.0
<<<<<<< Updated upstream
kwargs["vmin"], kwargs["vmax"] = 0.0, np.max(self.data[self.P > self.P_ERR])
||||||| constructed merge base
kwargs["vmin"], kwargs["vmax"] = 0.0, min(np.max(self.data[self.P > self.P_ERR]), 100.0)
=======
self.error = self.P_ERR * 100.0
self.fmt = "{0:.2f} ± {1:.2f} %"
kwargs["vmin"], kwargs["vmax"] = 0.0, min(np.max(self.data[self.P > self.P_ERR]), 100.0)
>>>>>>> Stashed changes
kwargs["alpha"] = 1.0 - 0.75 * (self.P < self.P_ERR)
label = r"$P$ [%]"
elif self.display_selection.lower() in ["pol_ang"]: