foscat 3.0.34__tar.gz → 3.0.35__tar.gz

{foscat-3.0.34 → foscat-3.0.35}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: foscat
-Version: 3.0.34
+Version: 3.0.35
 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.34 → foscat-3.0.35}/setup.py

@@ -3,7 +3,7 @@ from setuptools import setup, find_packages
 
 setup(
     name='foscat',
-    version='3.0.34',
+    version='3.0.35',
     description='Generate synthetic Healpix or 2D data using Cross Scattering Transform' ,
     long_description='Utilize the Cross Scattering Transform (described in https://arxiv.org/abs/2207.12527) to synthesize Healpix or 2D data that is suitable for component separation purposes, such as denoising. \n A demo package for this process can be found at https://github.com/jmdelouis/FOSCAT_DEMO. \n Complete doc can be found at https://foscat-documentation.readthedocs.io/en/latest/index.html. \n\n List of developers : J.-M. Delouis, T. Foulquier, L. Mousset, T. Odaka, F. Paul, E. Allys ' ,
     license='MIT',

{foscat-3.0.34 → foscat-3.0.35}/src/foscat/FoCUS.py

@@ -32,7 +32,7 @@ class FoCUS:
                  mpi_size=1,
                  mpi_rank=0):
 
-        self.__version__ = '3.0.34'
+        self.__version__ = '3.0.35'
         # P00 coeff for normalization for scat_cov
         self.TMPFILE_VERSION=TMPFILE_VERSION
         self.P1_dic = None

{foscat-3.0.34 → foscat-3.0.35}/src/foscat/GCNN.py

@@ -71,7 +71,7 @@ class GCNN:
         for i in range(self.nscale):
             totnchan=totnchan+self.chanlist[i]*self.chanlist[i+1]
         return self.npar*12*self.in_nside**2*self.chanlist[0] \
-            +totnchan*self.KERNELSZ*self.KERNELSZ+self.chanlist[self.nscale]*self.n_chan_out
+            +(totnchan+self.chanlist[i+1]*self.n_chan_out)*self.KERNELSZ*self.KERNELSZ
 
     def set_weights(self,x):
         self.x=x
@@ -107,8 +107,12 @@ class GCNN:
                 im=self.scat_operator.healpix_layer_transpose(im,ww,indices=indices[k],weights=weights[k],axis=1)
             im=self.scat_operator.backend.bk_relu(im)
 
-        ww=self.scat_operator.backend.bk_reshape(x[nn:],[self.chanlist[self.nscale],self.n_chan_out])
-        im=self.scat_operator.backend.bk_matmul(im,ww)
+        ww=self.scat_operator.backend.bk_reshape(x[nn:],[self.KERNELSZ*self.KERNELSZ,self.chanlist[self.nscale],self.n_chan_out])
+        if indices is None:
+            im=self.scat_operator.healpix_layer(im,ww,axis=1)
+        else:
+            im=self.scat_operator.healpix_layer(im,ww,indices=indices[self.nscale],weights=weights[self.nscale],axis=1)
+            
         if axis==0:
             im=self.scat_operator.backend.bk_reshape(im,[im.shape[1],im.shape[2]])
         return im

{foscat-3.0.34 → foscat-3.0.35}/src/foscat.egg-info/PKG-INFO

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