isgri 0.6.0__py3-none-any.whl → 0.6.1__py3-none-any.whl

isgri/__version__.py

@@ -1 +1 @@
-__version__ = "0.6.0"
+__version__ = "0.6.1"

isgri/catalog/scwquery.py

@@ -345,24 +345,29 @@ class ScwQuery:
         return self.catalog[combined_mask]
 
     def write(
-        self, output_path: Union[str, Path], swid_only: Optional[str] = False, overwrite: Optional[bool] = False
-    ):
+        self,
+        output_path: Union[str, Path],
+        swid_only: Optional[bool] = False,
+        overwrite: Optional[bool] = False,
+        columns: Optional[list[str]] = None,
+    ) -> None:
         """Write filtered catalog to the file.
 
         Parameters
         ----------
         output_path : str or Path
-            Path to output file. Format auto-detected from extension:
-                - .txt: SWID list (one per line)
-                - .fits: FITS table
-                - .csv: CSV table
+            Path to output file. Supports auto-detectable formats of astropy Table (e.g. fits, csv, qdp) and if failed, plain text in aligned columns.
         swid_only : bool, optional
-            If True, write only SWID list regardless of extension
+            If True, write only SWID list regardless of columns
         overwrite : bool, optional
             Whether to overwrite existing file, by default False
+        columns : list of str, optional
+            List of columns to write. If None, writes all columns or only SWID if swid_only=True
 
         Raises
         ------
+        TypeError
+            If output_path is not str or Path
         FileExistsError
             If file exists and overwrite=False
 
@@ -373,18 +378,39 @@ class ScwQuery:
         >>> query.write("scws.csv")
         >>> query.write("output", swid_only=True)  # Force SWID list regardless of extension
         """
+        if columns is None:
+            columns = self.catalog.colnames if not swid_only else ["SWID"]
 
-        results = self.get()
-        if isinstance(output_path, str):
+        results = self.get()[columns]
+        try:
             output_path = Path(output_path)
+        except TypeError:
+            raise TypeError(f"output_path must be str or Path, got {type(output_path)}")
+
         if output_path.exists() and not overwrite:
             raise FileExistsError(f"Output file already exists: {output_path}")
-        if swid_only or output_path.suffix == ".txt":
-            with open(output_path, "w") as f:
-                for swid in results["SWID"]:
-                    f.write(f"{swid}\n")
-        else:
+
+        try:
             results.write(output_path, overwrite=overwrite)
+            return
+        except Exception:
+            pass
+
+        # Manual write as aligned columns (plain text)
+        colnames = results.colnames
+        rows = [[str(val) for val in row] for row in results]
+        columns = list(zip(*([colnames] + rows)))  # Include headers
+        widths = [max(len(item) for item in col) for col in columns]
+
+        def format_row(file, row: list[str], header: bool = False) -> None:
+            if len(row) == 1 and header:
+                return
+            file.write("  ".join(f"{item:<{widths[i]}}" for i, item in enumerate(row)) + "\n")
+
+        with open(output_path, "w") as f:
+            format_row(f, colnames, header=True)
+            for row in rows:
+                format_row(f, row)
 
     def count(self) -> int:
         """

isgri/cli/query.py

@@ -78,23 +78,15 @@ def query_direct(
         if revolution:
             q = q.revolution(revolution)
 
-        results = q.get()
-
         if count:
-            click.echo(len(results))
-
-        elif list_swids:
-            for swid in results["SWID"]:
-                click.echo(swid)
-
+            click.echo(q.count())
+        
         elif output:
-            if output.endswith(".csv"):
-                results.write(output, format="ascii.csv", overwrite=True)
-            else:
-                results.write(output, format="fits", overwrite=True)
-            click.echo(f"Saved {len(results)} SCWs to {output}")
+            q.write(output, overwrite=True, swid_only=list_swids)
+            click.echo(f"Saved {q.count()} SCWs to {output}")
 
         else:
+            results = q.get()
             click.echo(f"Found {len(results)}/{initial_count} SCWs")
             if len(results) > 0:
                 display_cols = ["SWID", "TSTART", "TSTOP", "RA_SCX", "DEC_SCX"]

{isgri-0.6.0.dist-info → isgri-0.6.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: isgri
-Version: 0.6.0
+Version: 0.6.1
 Summary: Python package for INTEGRAL IBIS/ISGRI lightcurve analysis
 Author: Dominik Patryk Pacholski
 License: MIT
@@ -30,7 +30,7 @@ Query catalogs directly from the terminal:
 Query INTEGRAL Science Window catalogs with a fluent Python API:
 - Filter by time, position, quality, revolution
 - Calculate detector offsets
-- Export results to FITS/CSV
+- Export results to any auto detectable astropy table extension or in table aligned data for any other extension.
 
 ### Light Curve Analysis
 Extract and analyze ISGRI light curves:
@@ -87,6 +87,9 @@ results = (cat
     .get()
 )
 
+# Save selected columns to the file
+cat.write('example_file.any_extension',columns=['SWID','TSTART','TSTOP'])
+
 print(f"Found {len(results)} observations")
 ```
 

{isgri-0.6.0.dist-info → isgri-0.6.1.dist-info}/RECORD

@@ -1,21 +1,21 @@
 isgri/__init__.py,sha256=V2hnOxXKcjMiusdGP8sOAR4QsBlWHQ0pZZMN2Cean6o,38
-isgri/__version__.py,sha256=DS49q_bFynltwBtgneHYeVXTHLg5bjAOFWvTkv-jYmY,21
+isgri/__version__.py,sha256=XvHFZM0padtrqitt9-p2enlBUGqc6vGvWNLx2iJv09g,21
 isgri/config.py,sha256=i1ibczZsmgqELv4ik2h2nWLnHyl68_5KGsz5Ec8Uf4E,4365
 isgri/catalog/__init__.py,sha256=CT9Zd1WISpv7kowf3bqagKewZ8SjLr1rZzVSFkwEj3o,58
 isgri/catalog/builder.py,sha256=Ure_erpyApjSiAmIvhJahuf6c11VNXBn5R6-nQzsDw4,3488
-isgri/catalog/scwquery.py,sha256=HobS4Im1GF28ZFYWrdXjUbCGJahBE3aS23bkGkYPjGc,19233
+isgri/catalog/scwquery.py,sha256=3X9Es79UNGedhsS7EvArNGo8KMAMuUU9hMQIsrfRuBs,20259
 isgri/catalog/wcs.py,sha256=mD6bZxiBxKYpuYCl8f2tSCc8uuWFzMRL2jf5SuFAhfg,5562
 isgri/cli/__init__.py,sha256=-bBNFYOq80A2Egtpo5V5zWJtYOxQfRZFQ_feve5lkFU,23
 isgri/cli/main.py,sha256=pOwTbJ7nuOC48cdVm-e84GGjlOFic1ZMEvU2e3yKP4k,5613
-isgri/cli/query.py,sha256=s_9p09nct4KnU3RVWW1BytLIY4cuY0SlGIobaCf_VMs,5772
+isgri/cli/query.py,sha256=dUzLsEjjyzCQ1lbG3pVe0pvIWcDcNs-6T57ugUFUTdk,5542
 isgri/utils/__init__.py,sha256=H83Al7urc6LNW5KUzUBRdtRBUTahiZmkehKFiK90RrU,183
 isgri/utils/file_loaders.py,sha256=g-LUfYw35hPePlFeicymaL-NbZXzZWfNmM127XJjCKY,12497
 isgri/utils/lightcurve.py,sha256=Pjys-eIyKShDKHqFpGa9SZ0Dzz7LiLIwBpUkp_6s41g,14133
 isgri/utils/pif.py,sha256=LixlkShy1j_ymfdJLyCV8zl0EeHgfVDVjddSex18GLQ,8648
 isgri/utils/quality.py,sha256=Na-sNEX1E4xWQJx0FYe9vbOAgPrTcLohHeUAnmlKYSw,13348
 isgri/utils/time_conversion.py,sha256=MNPVjrsrmwRDbCWmqdWN0xRs8PtHkFGli-H2cYwF9Ns,5204
-isgri-0.6.0.dist-info/METADATA,sha256=OqyGmCzgW4fH3E__TwlEa-txR5wHlwtBWxme0miwwRc,3417
-isgri-0.6.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-isgri-0.6.0.dist-info/entry_points.txt,sha256=aM2K4RGihbwsj9crjPG-BvWhErcdtZt3tJqT6AaOojU,46
-isgri-0.6.0.dist-info/licenses/LICENSE,sha256=Q8oxmHR1cSnEXSHCjY3qeXMtupZI_1ZQZ1MBt4oeANE,1102
-isgri-0.6.0.dist-info/RECORD,,
+isgri-0.6.1.dist-info/METADATA,sha256=89GNYk4YvwD6xxSHjFyZJbF9ZquuuSFND7jWj-DKu_k,3613
+isgri-0.6.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+isgri-0.6.1.dist-info/entry_points.txt,sha256=aM2K4RGihbwsj9crjPG-BvWhErcdtZt3tJqT6AaOojU,46
+isgri-0.6.1.dist-info/licenses/LICENSE,sha256=Q8oxmHR1cSnEXSHCjY3qeXMtupZI_1ZQZ1MBt4oeANE,1102
+isgri-0.6.1.dist-info/RECORD,,