htrdrPy 1.1.7__tar.gz → 1.1.8__tar.gz

{htrdrpy-1.1.7 → htrdrpy-1.1.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: htrdrPy
-Version: 1.1.7
+Version: 1.1.8
 Summary: htrdrPy is a library that aims to wrap the radiative transfer code htrdr-planets, aiming to make the use of htrdr-planets more user-friendly.
 Project-URL: Homepage, https://gitlab.obspm.fr/aarfaux/htrdr-wrapper.git
 Project-URL: Documentation, https://htrdr-wrapper-ebbb17.pages.obspm.fr

{htrdrpy-1.1.7 → htrdrpy-1.1.8}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "htrdrPy"
-version = "1.1.7"
+version = "1.1.8"
 authors = [
   { name="Anthony Arfaux", email="anthony.arfaux@obspm.fr" },
 ]

{htrdrpy-1.1.7 → htrdrpy-1.1.8}/src/htrdrPy/geometry.py

@@ -201,8 +201,8 @@ class Geometry:
            Vector setting the upward direction of the camera (shape=(3),
            [m]) i.e. a vector in the pixel plane to turn the camera
            around the line of sight. If not provided, it is calculated
-           as perpendicular to the line of sight and to z axis (or x
-           axis if the z axis corresponds to the line of sight).
+           as perpendicular to the line of sight and within the merif=dional
+           plane (or x axis if the z axis corresponds to the line of sight).
         '''
         self.camera["position"] = position
         self.camera["target"] = targetPosition
@@ -475,7 +475,6 @@ class Geometry:
                              / (np.sin(ai) * np.sin(ae))
                              )
             azimut = aa / cst.degree
-            print(azimut)
         else:
             raise ValueError("At least one of the azimut or the phase angle must be provided")
 
@@ -503,10 +502,6 @@ class Geometry:
         self.setSource(Ss[2], Ss[1], Ss[0], srcRad, temperature=srcTemp,
                        radianceFile=radianceFile, spectrum=spectrum)
 
-        self.source.update({
-            'cart. position': Sc.tolist()
-                                        })
-
         self.setCamera(Cc, Tc, camFOV)
         return
 
@@ -515,6 +510,14 @@ class Geometry:
         Export the geometry (source, camera and image data) in a
         geometry_{case}.json file stored in the "geometries/" repository
         '''
+
+        Sc = sphere2cart(np.array([self.source['distance'],
+                                   self.source['latitude'],
+                                   self.source['longitude']]))
+        self.source.update({
+            'cart. position': Sc.tolist()
+                                        })
+
         file = f"{self.geometryFolder}geometry_{self.case}.json"
         with open(file, 'w') as f:
             f.write(json.dumps({
@@ -1177,12 +1180,14 @@ class Geometry:
 
     def __calculateRoll(self):
         '''
-        Calculate the roll as perpendicular to both the line of sight and the z axis.
-        In case the LOS is aligned with z, there are infinite possibilities and we arbitrary chose to fix the roll along x
+        Calculate the roll as perpendicular to the line of sight and belonging
+        to the meridional plane. In case the LOS is aligned with z, there are
+        infinite possibilities and we arbitrary chose to fix the roll along x
         '''
         cros = np.cross(self.lineOfSight, np.array([0., 0., 1.]))
+        cros2 = np.cross(cros, self.lineOfSight)
         if np.linalg.norm(cros) < 1e-10: return np.array([1., 0., 0.])  # if the line of sight is along z, we place the roll along x
-        else: return cros/np.linalg.norm(cros)          # esle, the roll is defined as perpendicular to both z and the line of sight
+        else: return cros2/np.linalg.norm(cros2)          # esle, the roll is defined as perpendicular to both z and the line of sight
 
     def __lineOfSight(self):
         ''' Calculate the line of sight and target to camera vectors'''

{htrdrpy-1.1.7 → htrdrpy-1.1.8}/src/htrdrPy/script.py

@@ -418,7 +418,9 @@ class Script:
         if self.__testNoScript(): return
 
         self.predefinedScript = "image"
-        self.wavelengths = {"type": kind, "low": wavelengthUp, "up": wavelengthLow}
+        self.wavelengths = {"type": kind,
+                            "low": wavelengthLow,
+                            "up": wavelengthUp}
         self.geometry = geometry
         return