foscat 3.0.41__py3-none-any.whl → 3.0.42__py3-none-any.whl

foscat/FoCUS.py

@@ -32,7 +32,7 @@ class FoCUS:
                  mpi_size=1,
                  mpi_rank=0):
 
-        self.__version__ = '3.0.41'
+        self.__version__ = '3.0.42'
         # P00 coeff for normalization for scat_cov
         self.TMPFILE_VERSION=TMPFILE_VERSION
         self.P1_dic = None
@@ -1340,10 +1340,10 @@ class FoCUS:
             res=v1/vh
             if calc_var:
                 if self.backend.bk_is_complex(vtmp):
-                    res2=self.backend.bk_sqrt((self.backend.bk_real(v2)/self.backend.bk_real(vh)
+                    res2=self.backend.bk_sqrt(((self.backend.bk_real(v2)/self.backend.bk_real(vh)
                                             -self.backend.bk_real(res)*self.backend.bk_real(res)) + \
                                             (self.backend.bk_imag(v2)/self.backend.bk_real(vh) \
-                                            -self.backend.bk_imag(res)*self.backend.bk_imag(res)))
+                                             -self.backend.bk_imag(res)*self.backend.bk_imag(res)))/self.backend.bk_real(vh))
                 else:
                     res2=self.backend.bk_sqrt((v2/vh-res*res)/(vh))
                 return res,res2
@@ -1361,10 +1361,10 @@ class FoCUS:
             res=v1/vh
             if calc_var:
                 if self.backend.bk_is_complex(l_x):
-                    res2=self.backend.bk_sqrt(self.backend.bk_real(v2)/self.backend.bk_real(vh)
+                    res2=self.backend.bk_sqrt((self.backend.bk_real(v2)/self.backend.bk_real(vh)
                                               -self.backend.bk_real(res)*self.backend.bk_real(res) + \
                                                self.backend.bk_imag(v2)/self.backend.bk_real(vh) \
-                                                -self.backend.bk_imag(res)*self.backend.bk_imag(res))
+                                                -self.backend.bk_imag(res)*self.backend.bk_imag(res))/self.backend.bk_real(vh))
                 else:
                     res2=self.backend.bk_sqrt((v2/vh-res*res)/(vh))
                 return res,res2

foscat/backend.py

@@ -292,7 +292,9 @@ class foscat_backend:
         if self.BACKEND==self.TENSORFLOW:
             return(self.backend.cast(x>threshold,x.dtype)*x)
         if self.BACKEND==self.TORCH:
-            return(self.backend.cast(x>threshold,x.dtype)*x)
+            x.to(x.dtype)
+            return (x>threshold)*x
+            #return(self.backend.cast(x>threshold,x.dtype)*x)
         if self.BACKEND==self.NUMPY:
             return (x>threshold)*x
 
@@ -787,6 +789,12 @@ class foscat_backend:
             else:
                 return(x)
 
+        if isinstance(x,np.int32) or isinstance(x,np.int64) or isinstance(x,int):
+            if self.all_bk_type=='float64':
+                return(np.float64(x))
+            else:
+                return(np.float32(x))
+            
         if self.bk_is_complex(x):
             out_type=self.all_cbk_type
         else:

{foscat-3.0.41.dist-info → foscat-3.0.42.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: foscat
-Version: 3.0.41
+Version: 3.0.42
 Summary: Generate synthetic Healpix or 2D data using Cross Scattering Transform
 Home-page: https://github.com/jmdelouis/FOSCAT
 Author: Jean-Marc DELOUIS

{foscat-3.0.41.dist-info → foscat-3.0.42.dist-info}/RECORD

@@ -1,13 +1,13 @@
 foscat/CNN.py,sha256=M7i9gdPQvFTPxKySrlaKsCnOXK0iwXBKcQ2FqdPK-JM,4408
 foscat/CircSpline.py,sha256=610sgsWeZzRXYh7gYEqUmGQVrXoHSaFGKjH5mCdh4jU,1684
-foscat/FoCUS.py,sha256=Yz-K-u5V2h1QEBb2CXBDmUw3rQvekjW6szIFehg81Ts,76507
+foscat/FoCUS.py,sha256=2yJG_XRAiyk1ziHMrbTUj15Yzth4mabN5VuNTWLN9bM,76562
 foscat/GCNN.py,sha256=qyKJpv238rwXPIMRRw4opHKaS6JaDtpC63QNncydeD0,6706
 foscat/GetGPUinfo.py,sha256=c01MFYCk38niYCTp0vX3WP24zVDHIsex-Cu42hc9Q18,724
 foscat/Softmax.py,sha256=UDc8Kbl0qWfH1bqDDwfLnkxhON7p93ueZ-Qg2oY4Ke4,2874
 foscat/Spline1D.py,sha256=9oeM8SSHjpfUE5z72YxGt1RVt22vJYM1zhHbNBW8phw,1232
 foscat/Synthesis.py,sha256=aqV_3Npcl2RQj-wxQ0hDMCo650lrN6YRaMd0fAoCrQ4,12615
 foscat/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-foscat/backend.py,sha256=c-z6t8hGM54nFbpfygB8-zoWxsw7CV-zSALQ1k3ksEE,31960
+foscat/backend.py,sha256=0VyVB629qsZukJ9bseVqA8047snkpZAoiMd2kbSrqcY,32255
 foscat/backend_tens.py,sha256=zEFZ71j0nMNP9_91tz21ZVBTayr75l-sfONOLkJ8DyI,1432
 foscat/loss_backend_tens.py,sha256=WbGC4vy1pBg_bxUXnlCRiXX9WszN6MaUWUc_lUvZNvQ,1667
 foscat/loss_backend_torch.py,sha256=WYK3Cvgo4AvVFfLaE8daZP4N3QwLiVGB2QIj2GmfYVQ,2327
@@ -19,7 +19,7 @@ foscat/scat_cov1D.py,sha256=1bhzaW-5Pcr1aEPOYIXiwu8KOy38JE0g_Y5PvFzGQs8,60599
 foscat/scat_cov2D.py,sha256=8_XvC-lOEVUWP9vT3Wx10G_ATeVeh0SdrSWuBV7Xf5k,536
 foscat/scat_cov_map.py,sha256=ocU2xd41GtJhiU9S3dEv38KfPCvz0tJKY2f8lPxpm5c,2729
 foscat/scat_cov_map2D.py,sha256=t4llIt7DVIyU1b_u-dJSX4lBr2FhDict8RnNnHpRvHM,2754
-foscat-3.0.41.dist-info/METADATA,sha256=JpZJiIstNXWXHv6YzBKQwpdh4fU6WAvBWRTxcP1Ypks,1013
-foscat-3.0.41.dist-info/WHEEL,sha256=rWxmBtp7hEUqVLOnTaDOPpR-cZpCDkzhhcBce-Zyd5k,91
-foscat-3.0.41.dist-info/top_level.txt,sha256=AGySXBBAlJgb8Tj8af6m_F-aiNg2zNTcybCUPVOKjAg,7
-foscat-3.0.41.dist-info/RECORD,,
+foscat-3.0.42.dist-info/METADATA,sha256=VMxAQQWHvl95r61wrwB7LJJoEFohNGgWg6DtJW_8a08,1013
+foscat-3.0.42.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+foscat-3.0.42.dist-info/top_level.txt,sha256=AGySXBBAlJgb8Tj8af6m_F-aiNg2zNTcybCUPVOKjAg,7
+foscat-3.0.42.dist-info/RECORD,,

{foscat-3.0.41.dist-info → foscat-3.0.42.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (71.0.4)
+Generator: bdist_wheel (0.42.0)
 Root-Is-Purelib: true
 Tag: py3-none-any