foscat 3.0.33__py3-none-any.whl → 3.0.34__py3-none-any.whl

foscat/FoCUS.py

@@ -32,7 +32,7 @@ class FoCUS:
                  mpi_size=1,
                  mpi_rank=0):
 
-        self.__version__ = '3.0.33'
+        self.__version__ = '3.0.34'
         # P00 coeff for normalization for scat_cov
         self.TMPFILE_VERSION=TMPFILE_VERSION
         self.P1_dic = None
@@ -328,33 +328,44 @@ class FoCUS:
         x,y,z=hp.pix2vec(nside,np.arange(12*nside*nside),nest=True)
 
         idx=np.argsort((x-1.0)**2+y**2+z**2)[0:kernel]
+        x0,y0,z0=hp.pix2vec(nside,idx[0],nest=True)
+        t0,p0=hp.pix2ang(nside,idx[0],nest=True)
+        
+        idx=np.argsort((x-x0)**2+(y-y0)**2+(z-z0)**2)[0:kernel]
         im=np.ones([12*nside**2])*-1
         im[idx]=np.arange(len(idx))
+        
         xc,yc,zc=hp.pix2vec(nside,idx,nest=True)
+        
+        xc-=x0
+        yc-=y0
+        zc-=z0
 
         vec=np.concatenate([np.expand_dims(x,-1),
                             np.expand_dims(y,-1),
                             np.expand_dims(z,-1)],1)
 
-        tc,pc=hp.pix2ang(nside,idx,nest=True)
-
         indices=np.zeros([12*nside**2*250,2],dtype='int')
         weights=np.zeros([12*nside**2*250])
         nn=0
-        for k in range(0,12*nside*nside):
+        for k in range(12*nside*nside):
             if k%(nside*nside)==nside*nside-1:
                 print('Nside=%d KenelSZ=%d %.2f%%'%(nside,kernel,k/(12*nside**2)*100))
-            idx2=hp.query_disc(nside, vec[k], np.pi/nside, inclusive=True,nest=True)
+            if nside<4:
+                idx2=np.arange(12*nside**2)
+            else:
+                idx2=hp.query_disc(nside, vec[k], np.pi/nside, inclusive=True,nest=True)
             t2,p2=hp.pix2ang(nside,idx2,nest=True)
             if rotation is None:
-                rot=[po[k]/np.pi*180.0,90+(-to[k])/np.pi*180.0]
+                rot=[po[k]/np.pi*180.0,(t0-to[k])/np.pi*180.0]
             else:
-                rot=[po[k]/np.pi*180.0,90+(-to[k])/np.pi*180.0,rotation[k]]
+                rot=[po[k]/np.pi*180.0,(t0-to[k])/np.pi*180.0,rotation[k]]
+                
             r=hp.Rotator(rot=rot)
             t2,p2=r(t2,p2)
-            idx3=hp.ang2pix(nside,t2,p2,nest=True)
+            
             ii,ww=hp.get_interp_weights(nside,t2,p2,nest=True)
-
+            
             ii=im[ii]
 
             for l in range(4):
@@ -410,18 +421,18 @@ class FoCUS:
     def init_CNN_index(self,nside,transpose=False):
         l_kernel=int(self.KERNELSZ*self.KERNELSZ)
         try:
-            indices=np.load('%s/FOSCAT_%s_I%d_%d_%d_CNNV2.npy'%(self.TEMPLATE_PATH,TMPFILE_VERSION,l_kernel,self.NORIENT,nside))
-            weights=np.load('%s/FOSCAT_%s_W%d_%d_%d_CNNV2.npy'%(self.TEMPLATE_PATH,TMPFILE_VERSION,l_kernel,self.NORIENT,nside))
-            xc=np.load('%s/FOSCAT_%s_X%d_%d_%d_CNNV2.npy'%(self.TEMPLATE_PATH,TMPFILE_VERSION,l_kernel,self.NORIENT,nside))
-            yc=np.load('%s/FOSCAT_%s_Y%d_%d_%d_CNNV2.npy'%(self.TEMPLATE_PATH,TMPFILE_VERSION,l_kernel,self.NORIENT,nside))
-            zc=np.load('%s/FOSCAT_%s_Z%d_%d_%d_CNNV2.npy'%(self.TEMPLATE_PATH,TMPFILE_VERSION,l_kernel,self.NORIENT,nside))
+            indices=np.load('%s/FOSCAT_%s_I%d_%d_%d_CNNV3.npy'%(self.TEMPLATE_PATH,TMPFILE_VERSION,l_kernel,self.NORIENT,nside))
+            weights=np.load('%s/FOSCAT_%s_W%d_%d_%d_CNNV3.npy'%(self.TEMPLATE_PATH,TMPFILE_VERSION,l_kernel,self.NORIENT,nside))
+            xc=np.load('%s/FOSCAT_%s_X%d_%d_%d_CNNV3.npy'%(self.TEMPLATE_PATH,TMPFILE_VERSION,l_kernel,self.NORIENT,nside))
+            yc=np.load('%s/FOSCAT_%s_Y%d_%d_%d_CNNV3.npy'%(self.TEMPLATE_PATH,TMPFILE_VERSION,l_kernel,self.NORIENT,nside))
+            zc=np.load('%s/FOSCAT_%s_Z%d_%d_%d_CNNV3.npy'%(self.TEMPLATE_PATH,TMPFILE_VERSION,l_kernel,self.NORIENT,nside))
         except:
             indices,weights,xc,yc,zc=self.calc_indices_convol(nside,l_kernel)
-            np.save('%s/FOSCAT_%s_I%d_%d_%d_CNNV2.npy'%(self.TEMPLATE_PATH,TMPFILE_VERSION,l_kernel,self.NORIENT,nside),indices)
-            np.save('%s/FOSCAT_%s_W%d_%d_%d_CNNV2.npy'%(self.TEMPLATE_PATH,TMPFILE_VERSION,l_kernel,self.NORIENT,nside),weights)
-            np.save('%s/FOSCAT_%s_X%d_%d_%d_CNNV2.npy'%(self.TEMPLATE_PATH,TMPFILE_VERSION,l_kernel,self.NORIENT,nside),xc)
-            np.save('%s/FOSCAT_%s_Y%d_%d_%d_CNNV2.npy'%(self.TEMPLATE_PATH,TMPFILE_VERSION,l_kernel,self.NORIENT,nside),yc)
-            np.save('%s/FOSCAT_%s_Z%d_%d_%d_CNNV2.npy'%(self.TEMPLATE_PATH,TMPFILE_VERSION,l_kernel,self.NORIENT,nside),zc)
+            np.save('%s/FOSCAT_%s_I%d_%d_%d_CNNV3.npy'%(self.TEMPLATE_PATH,TMPFILE_VERSION,l_kernel,self.NORIENT,nside),indices)
+            np.save('%s/FOSCAT_%s_W%d_%d_%d_CNNV3.npy'%(self.TEMPLATE_PATH,TMPFILE_VERSION,l_kernel,self.NORIENT,nside),weights)
+            np.save('%s/FOSCAT_%s_X%d_%d_%d_CNNV3.npy'%(self.TEMPLATE_PATH,TMPFILE_VERSION,l_kernel,self.NORIENT,nside),xc)
+            np.save('%s/FOSCAT_%s_Y%d_%d_%d_CNNV3.npy'%(self.TEMPLATE_PATH,TMPFILE_VERSION,l_kernel,self.NORIENT,nside),yc)
+            np.save('%s/FOSCAT_%s_Z%d_%d_%d_CNNV3.npy'%(self.TEMPLATE_PATH,TMPFILE_VERSION,l_kernel,self.NORIENT,nside),zc)
             if not self.silent:
                 print('Write %s/FOSCAT_%s_W%d_%d_%d_CNNV2.npy'%(self.TEMPLATE_PATH,TMPFILE_VERSION,l_kernel,self.NORIENT,nside))
 
@@ -433,8 +444,8 @@ class FoCUS:
                                                                  12*nside*nside])
             
     # ---------------------------------------------−---------
-    def healpix_layer_coord(self,im):
-        nside=int(np.sqrt(im.shape[0]//12))
+    def healpix_layer_coord(self,im,axis=0):
+        nside=int(np.sqrt(im.shape[axis]//12))
         l_kernel=self.KERNELSZ*self.KERNELSZ
         if self.ww_CNN[nside] is None:
             self.init_CNN_index(nside)
@@ -486,7 +497,7 @@ class FoCUS:
                 return 0
             
             mat=self.backend.bk_SparseTensor(indices,weights,[12*nside*nside*l_kernel,12*nside*nside])
-
+            
         if axis==1:
             results=[]
         
@@ -498,14 +509,14 @@ class FoCUS:
                 
                 density=self.backend.bk_matmul(density,self.backend.bk_reshape(ww,[l_kernel*im.shape[1+axis],ww.shape[2]]))
                 
-                results.append(self.backend.bk_reshape(density,[1,12*nside**2,ww.shape[2]]))
+                results.append(self.backend.bk_reshape(density,[12*nside**2,ww.shape[2]]))
             
             return self.backend.bk_stack(results,axis=0)
         else:
             tmp=self.backend.bk_sparse_dense_matmul(mat,im)
             
             density=self.backend.bk_reshape(tmp,[12*nside*nside,l_kernel*im.shape[1]])
-
+            
             return self.backend.bk_matmul(density,self.backend.bk_reshape(ww,[l_kernel*im.shape[1],ww.shape[2]]))
     # ---------------------------------------------−---------
     

{foscat-3.0.33.dist-info → foscat-3.0.34.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: foscat
-Version: 3.0.33
+Version: 3.0.34
 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.33.dist-info → foscat-3.0.34.dist-info}/RECORD

@@ -1,6 +1,6 @@
 foscat/CNN.py,sha256=M7i9gdPQvFTPxKySrlaKsCnOXK0iwXBKcQ2FqdPK-JM,4408
 foscat/CircSpline.py,sha256=610sgsWeZzRXYh7gYEqUmGQVrXoHSaFGKjH5mCdh4jU,1684
-foscat/FoCUS.py,sha256=iKHY48ukkB4KCOSaGV03pYmqLCQhU1k7VkB8w_gK0o4,71802
+foscat/FoCUS.py,sha256=9Oxf-muKAwa2vyT8l8l_6A8tad52kSXJNvisPalFlkE,72101
 foscat/GCNN.py,sha256=uaJteFo9DUIYnp0yGj7MeW6z3ZQEHFUBGRBuUhy46yY,4241
 foscat/GetGPUinfo.py,sha256=c01MFYCk38niYCTp0vX3WP24zVDHIsex-Cu42hc9Q18,724
 foscat/Softmax.py,sha256=UDc8Kbl0qWfH1bqDDwfLnkxhON7p93ueZ-Qg2oY4Ke4,2874
@@ -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.33.dist-info/METADATA,sha256=sblpIJBAMB9ZYPPPzdpIXqq0B5nmbo_y2JniYuI9LF4,1013
-foscat-3.0.33.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-foscat-3.0.33.dist-info/top_level.txt,sha256=AGySXBBAlJgb8Tj8af6m_F-aiNg2zNTcybCUPVOKjAg,7
-foscat-3.0.33.dist-info/RECORD,,
+foscat-3.0.34.dist-info/METADATA,sha256=Fq0p3sOVZh9JRuD4SdSayx5W8tTCT7eS_CWPpvnZFsI,1013
+foscat-3.0.34.dist-info/WHEEL,sha256=cpQTJ5IWu9CdaPViMhC9YzF8gZuS5-vlfoFihTBC86A,91
+foscat-3.0.34.dist-info/top_level.txt,sha256=AGySXBBAlJgb8Tj8af6m_F-aiNg2zNTcybCUPVOKjAg,7
+foscat-3.0.34.dist-info/RECORD,,

{foscat-3.0.33.dist-info → foscat-3.0.34.dist-info}/WHEEL

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