foscat 3.7.0__py3-none-any.whl → 3.7.2__py3-none-any.whl

foscat/scat_cov2D.py

@@ -1,5 +1,5 @@
 import foscat.scat_cov as scat
-
+import numpy as np
 
 class scat_cov2D:
     def __init__(self, s0, s2, s3, s4, s1=None, s3p=None, backend=None):
@@ -48,31 +48,71 @@ class funct(scat.funct):
 
         return spectrum_1d
 
-    def plot_results(self,in_image,out_image,vmin=None,vmax=None,cmap='coolwarm'):
+    def plot_results(self,in_image,out_image,vmin=None,vmax=None,cmap='coolwarm',spec_range=None):
         import matplotlib.pyplot as plt
         
-        plt.figure(figsize=(16,3))
-        plt.subplot(1,4,1)
-        plt.title('Original field') 
-        plt.imshow(in_image,cmap=cmap,vmin=vmin,vmax=vmax,origin='lower')
-        plt.xticks([])
-        plt.yticks([])
-        plt.subplot(1,4,2)
-        plt.title('Modeled field') 
-        plt.imshow(out_image,cmap=cmap,vmin=vmin,vmax=vmax,origin='lower')
-        plt.xticks([])
-        plt.yticks([])
-        plt.subplot(1,4,3)
-        plt.title('Histogram') 
-        plt.hist(in_image.flatten(),bins=100,label='original',color='r',histtype='step',log=True)
-        plt.hist(out_image.flatten(),bins=100,label='modeled',color='b',histtype='step',log=True)
-        plt.legend(frameon=0)
-        plt.subplot(1,4,4)
-        plt.title('Powerspectra') 
-        plt.plot(self.spectrum(in_image),color='b',label='original')
-        plt.plot(self.spectrum(out_image),color='r',label='modeled')
-        plt.xscale('log')
-        plt.yscale('log')
-        plt.legend(frameon=0)
+        if len(out_image.shape)>2:
+            nimage=out_image.shape[0]
+            ndraw=np.min([3,nimage])
+            plt.figure(figsize=(16,12))
+            plt.subplot(2,ndraw+1,1)
+            plt.title('Original field') 
+            plt.imshow(in_image,cmap=cmap,vmin=vmin,vmax=vmax,origin='lower')
+            plt.xticks([])
+            plt.yticks([])
+            for k in range(ndraw):
+                plt.subplot(2,ndraw+1,2+k)
+                plt.title('Modeled field #%d'%(k)) 
+                plt.imshow(out_image[k],cmap=cmap,vmin=vmin,vmax=vmax,origin='lower')
+                plt.xticks([])
+                plt.yticks([])
+            plt.subplot(2,2,3)
+            plt.title('Histogram') 
+            for k in range(nimage):
+                if k==0:
+                    plt.hist(out_image[k].flatten(),bins=100,label='modeled',color='b',histtype='step',log=True,alpha=0.5)
+                else:
+                    plt.hist(out_image[k].flatten(),bins=100,color='b',histtype='step',log=True,alpha=0.5)
+            plt.hist(in_image.flatten(),bins=100,label='original',color='r',histtype='step',log=True)
+            plt.legend(frameon=0)
+            plt.subplot(2,2,4)
+            plt.title('Powerspectra') 
+            for k in range(nimage):
+                if k==0:
+                    plt.plot(self.spectrum(out_image[k]),color='b',label='modeled',alpha=0.5)
+                else:
+                    plt.plot(self.spectrum(out_image[k]),color='b',alpha=0.5)
+            plt.plot(self.spectrum(in_image),color='r',label='original')
+            plt.xscale('log')
+            plt.yscale('log')
+            plt.legend(frameon=0)
+            if spec_range is not None:
+                plt.ylim(spec_range[0],spec_range[1])
+        else:
+            plt.figure(figsize=(16,3))
+            plt.subplot(1,4,1)
+            plt.title('Original field') 
+            plt.imshow(in_image,cmap=cmap,vmin=vmin,vmax=vmax,origin='lower')
+            plt.xticks([])
+            plt.yticks([])
+            plt.subplot(1,4,2)
+            plt.title('Modeled field') 
+            plt.imshow(out_image,cmap=cmap,vmin=vmin,vmax=vmax,origin='lower')
+            plt.xticks([])
+            plt.yticks([])
+            plt.subplot(1,4,3)
+            plt.title('Histogram') 
+            plt.hist(in_image.flatten(),bins=100,label='original',color='r',histtype='step',log=True)
+            plt.hist(out_image.flatten(),bins=100,label='modeled',color='b',histtype='step',log=True)
+            plt.legend(frameon=0)
+            plt.subplot(1,4,4)
+            plt.title('Powerspectra') 
+            plt.plot(self.spectrum(in_image),color='b',label='original')
+            plt.plot(self.spectrum(out_image),color='r',label='modeled')
+            plt.xscale('log')
+            plt.yscale('log')
+            if spec_range is not None:
+                plt.ylim(spec_range[0],spec_range[1])
+            plt.legend(frameon=0)
         
         

{foscat-3.7.0.dist-info → foscat-3.7.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: foscat
-Version: 3.7.0
+Version: 3.7.2
 Summary: Generate synthetic Healpix or 2D data using Cross Scattering Transform
 Author-email: Jean-Marc DELOUIS <jean.marc.delouis@ifremer.fr>
 Maintainer-email: Theo Foulquier <theo.foulquier@ifremer.fr>
@@ -18,7 +18,7 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown
-License-File: LICENCE
+License-File: LICENSE
 Requires-Dist: imageio
 Requires-Dist: imagecodecs
 Requires-Dist: matplotlib

{foscat-3.7.0.dist-info → foscat-3.7.2.dist-info}/RECORD

@@ -1,26 +1,26 @@
 foscat/CNN.py,sha256=j0F2a4Xf3LijhyD_WVZ6Eg_IjGuXw3ddH6Iudj1xVaw,4874
 foscat/CircSpline.py,sha256=CXi49FxF8ZoeZ17Ua8c1AZXe2B5ICEC9aCXb97atB3s,4028
-foscat/FoCUS.py,sha256=Bkq-DZLKnu_KDF9EGJhzGKtuWciHTv0vAU0tKNd_-ao,102595
+foscat/FoCUS.py,sha256=DaK1YwUVwMwJikG676kp_OGWRxfytVlxU6f0bbjxCvs,102659
 foscat/GCNN.py,sha256=5RV-FKuvqbD-k99TwiM4CttM2LMZE21WD0IK0j5Mkko,7599
 foscat/Softmax.py,sha256=aBLQauoG0q2SJYPotV6U-cxAhsJcspWHNRWdnA_nAiQ,2854
 foscat/Spline1D.py,sha256=rKzzenduaZZ-yBDJd35it6Gyrj1spqb7hoIaUgISPzY,2983
 foscat/Synthesis.py,sha256=3oL-WIwOzjO6jYn-7J3TfAQSiPaQTqGtrmxcGBh1Gvs,13787
 foscat/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 foscat/alm.py,sha256=PaAaq82CH3JzH520eQpqTCivxE4VeJmmc6I_9HXIhcA,32480
-foscat/backend.py,sha256=ednCoHUenHClbShG6cBWnlqjYHtN4jAzMf8tzZ_7X_w,43429
+foscat/backend.py,sha256=P_NmxrK8jMRgYMA8Qinpw-7QJcXcB4qt64Ya3cAD1Dg,45317
 foscat/backend_tens.py,sha256=9Dp136m9frkclkwifJQLLbIpl3ETI3_txdPUZcKfuMw,1618
 foscat/loss_backend_tens.py,sha256=dCOVN6faDtIpN3VO78HTmYP2i5fnFAf-Ddy5qVBlGrM,1783
 foscat/loss_backend_torch.py,sha256=k3z18Dj3SaLKK6ZIKcm7GO4U_YKYVP6LtHG1aIbxkYk,1627
 foscat/scat.py,sha256=qGYiBIysPt65MdmF07WWA4piVlTfA9-lFDTaicnqC2w,72822
 foscat/scat1D.py,sha256=W5Uu6wdQ4ZsFKXpof0f1OBl-1wjJmW7ruvddRWxe7uM,53726
 foscat/scat2D.py,sha256=boKj0ASqMMSy7uQLK6hPniG87m3hZGJBYBiq5v8F9IQ,532
-foscat/scat_cov.py,sha256=vyeOpnhfSZyOexEmWlYdr4w_udWLw01HlzbHhWUWHNk,157259
+foscat/scat_cov.py,sha256=3q2rBhcgXGIhW30kSUb5LkfC_1wk_OypphlIPBTzEsE,241234
 foscat/scat_cov1D.py,sha256=XOxsZZ5TYq8f34i2tUgIfzyaqaTDlICB3HzD2l_puro,531
-foscat/scat_cov2D.py,sha256=gABI0nztBU9HUdHJ0fLLITOZ9895wB1hKm_Fjp9D3ns,2830
+foscat/scat_cov2D.py,sha256=HVYBNtpZgRlz6OOm0LwG_w8Q4Kld4Qc1n6XYeGoxIug,4802
 foscat/scat_cov_map.py,sha256=Swt39-nYEaQkBzyX4EOAQBvUuYQpERzJ-uVxSWS2b-Y,2911
 foscat/scat_cov_map2D.py,sha256=FqF45FBcoiQbvuVsrLWUIPRUc95GsKsrnH6fKzB3GlE,2841
-foscat-3.7.0.dist-info/LICENCE,sha256=i0ukIr8ZUpkSY2sZaE9XZK-6vuSU5iG6IgX_3pjatP8,1505
-foscat-3.7.0.dist-info/METADATA,sha256=OkQy2zp4wDIKh_Zma9jABKGJIqkAala9zwV7f7fVVoE,7216
-foscat-3.7.0.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
-foscat-3.7.0.dist-info/top_level.txt,sha256=AGySXBBAlJgb8Tj8af6m_F-aiNg2zNTcybCUPVOKjAg,7
-foscat-3.7.0.dist-info/RECORD,,
+foscat-3.7.2.dist-info/LICENSE,sha256=i0ukIr8ZUpkSY2sZaE9XZK-6vuSU5iG6IgX_3pjatP8,1505
+foscat-3.7.2.dist-info/METADATA,sha256=xVWiNu2F2NbJVh96gwtH7Hv4Q_UZd1WQvRxwcAYBlSk,7216
+foscat-3.7.2.dist-info/WHEEL,sha256=52BFRY2Up02UkjOa29eZOS2VxUrpPORXg1pkohGGUS8,91
+foscat-3.7.2.dist-info/top_level.txt,sha256=AGySXBBAlJgb8Tj8af6m_F-aiNg2zNTcybCUPVOKjAg,7
+foscat-3.7.2.dist-info/RECORD,,

{foscat-3.7.0.dist-info → foscat-3.7.2.dist-info}/WHEEL

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