isgri 0.7.1__py3-none-any.whl → 0.7.2__py3-none-any.whl

isgri/__version__.py

@@ -1 +1 @@
-__version__ = "0.7.1"
+__version__ = "0.7.2"

isgri/cli/main.py

@@ -30,7 +30,10 @@ def main():
 )
 @click.option("--list-swids", is_flag=True, help="Only output SWID list")
 @click.option("--count", is_flag=True, help="Only show count")
-def query(catalog, tstart, tstop, ra, dec, radius, fov, max_chi, chi_type, revolution, output, list_swids, count):
+@click.option("--columns", help="Comma-separated list of columns to save (e.g., SWID,TSTART,TSTOP)")
+def query(
+    catalog, tstart, tstop, ra, dec, radius, fov, max_chi, chi_type, revolution, output, list_swids, count, columns
+):
     """
     Query INTEGRAL science window catalog.
 
@@ -59,6 +62,10 @@ def query(catalog, tstart, tstop, ra, dec, radius, fov, max_chi, chi_type, revol
 
             isgri query --tstart 3000 --tstop 3100 --output results.fits
 
+        Save specific columns:
+
+            isgri query --tstart 3000 --tstop 3100 --output results.fits --columns SWID,TSTART,TSTOP,CHI
+
         Get only SWID list:
 
             isgri query --tstart 3000 --tstop 3100 --list-swids
@@ -70,14 +77,26 @@ def query(catalog, tstart, tstop, ra, dec, radius, fov, max_chi, chi_type, revol
     if catalog is None:
         cfg = Config()
         catalog = cfg.catalog_path
-
-        if not catalog:
-            click.echo("Error: No catalog configured", err=True)
+        if catalog is None:
+            click.echo("Error: No catalog path configured", err=True)
             raise click.Abort()
 
     if any(param is not None for param in [tstart, tstop, ra, dec, radius, max_chi, revolution]):
         query_direct(
-            catalog, tstart, tstop, ra, dec, radius, fov, max_chi, chi_type, revolution, output, list_swids, count
+            catalog,
+            tstart,
+            tstop,
+            ra,
+            dec,
+            radius,
+            fov,
+            max_chi,
+            chi_type,
+            revolution,
+            output,
+            list_swids,
+            count,
+            columns,
         )
     else:
         query_interactive(catalog)

isgri/cli/query.py

@@ -55,10 +55,10 @@ def match_command(user_input):
     commands = {
         "time": ["time", "t"],
         "pos": ["pos", "position", "p"],
-        "quality": ["quality", "qual", "q"],
-        "revolution": ["revolution", "rev", "r"],
+        "quality": ["quality", "qual"],
+        "revolution": ["revolution", "rev"],
         "show": ["show", "s", "display"],
-        "reset": ["reset", "clear"],
+        "reset": ["reset", "clear", "r"],
         "save": ["save", "write"],
         "help": ["help", "h", "?"],
         "exit": ["exit", "quit", "q"],
@@ -77,7 +77,20 @@ def match_command(user_input):
 
 
 def query_direct(
-    catalog_path, tstart, tstop, ra, dec, radius, fov, max_chi, chi_type, revolution, output, list_swids, count
+    catalog_path,
+    tstart,
+    tstop,
+    ra,
+    dec,
+    radius,
+    fov,
+    max_chi,
+    chi_type,
+    revolution,
+    output,
+    list_swids,
+    count,
+    columns,
 ):
     try:
         q = ScwQuery(catalog_path)
@@ -108,7 +121,17 @@ def query_direct(
             click.echo(q.count())
 
         elif output:
-            q.write(output, overwrite=True, swid_only=list_swids)
+            col_list = None
+            if columns and not list_swids:
+                col_list = [c.strip() for c in columns.split(",")]
+                available = q.catalog.colnames
+                invalid = [c for c in col_list if c not in available]
+                if invalid:
+                    click.echo(f"Error: Invalid columns: {invalid}", err=True)
+                    click.echo(f"Available: {', '.join(available)}", err=True)
+                    raise click.Abort()
+
+            q.write(output, overwrite=True, swid_only=list_swids, columns=col_list)
             click.echo(f"Saved {q.count()} SCWs to {output}")
 
         else:
@@ -196,9 +219,33 @@ def query_interactive(catalog_path):
                 click.echo(f"→ {len(q.catalog)} SCWs")
             elif cmd == "save":
                 swid_only = click.confirm("Save only SWID list?", default=False)
+
+                col_list = None
+                if not swid_only:
+                    if click.confirm("Select specific columns?", default=False):
+                        click.echo("\nAvailable columns:")
+                        available = q.catalog.colnames
+                        for i, col in enumerate(available, 1):
+                            click.echo(f"  {i:2d}. {col}")
+
+                        click.echo("\nEnter column names (comma-separated) or leave empty for all:")
+                        col_input = click.prompt("Columns", default="", show_default=False)
+
+                        if col_input:
+                            col_list = [c.strip() for c in col_input.split(",")]
+                            invalid = [c for c in col_list if c not in available]
+                            if invalid:
+                                click.echo(f"Warning: Invalid columns ignored: {invalid}")
+                                col_list = [c for c in col_list if c in available]
+
+                            if not col_list:
+                                click.echo("No valid columns selected, using all")
+                                col_list = None
+
                 path = click.prompt("File")
-                q.write(path, overwrite=True, swid_only=swid_only)
-                click.echo(f"✓ Saved")
+                q.write(path, overwrite=True, swid_only=swid_only, columns=col_list)
+                click.echo(f"Saved {q.count()} SCWs to {path}")
+
             elif cmd is None:
                 click.echo(f"Unknown command: {user_input}. Type 'help' for available commands.")
             else:

{isgri-0.7.1.dist-info → isgri-0.7.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: isgri
-Version: 0.7.1
+Version: 0.7.2
 Summary: Python package for INTEGRAL IBIS/ISGRI lightcurve analysis
 Author: Dominik Patryk Pacholski
 License: MIT

{isgri-0.7.1.dist-info → isgri-0.7.2.dist-info}/RECORD

@@ -1,5 +1,5 @@
 isgri/__init__.py,sha256=V2hnOxXKcjMiusdGP8sOAR4QsBlWHQ0pZZMN2Cean6o,38
-isgri/__version__.py,sha256=tUukPDbH9wVBvn9_DYqm0p_Q7TagQGM_2ZX042hSuUs,21
+isgri/__version__.py,sha256=ISWV9_SJtaCeILz1FAMYHSjVkHbV08KnnT23Ww0_w-o,21
 isgri/config.py,sha256=8hziHnQN_dnS3FkOtrPUUV1QLJ9HmGiPzDuAiq3GoXc,5044
 isgri/catalog/__init__.py,sha256=IGfzGcGx1F1zplj7YIUuzE5Cvvxg7XJi0zu0aBXI0-A,113
 isgri/catalog/builder.py,sha256=J1Z_p699hoQtiQjYw5-jvf0aSIIOcpe8djbCjh-NOng,15779
@@ -7,16 +7,16 @@ isgri/catalog/scwquery.py,sha256=v7nR6-6PmYaBunFeGtmDWPqDkUBUvwjv2jtM1RbGQx4,203
 isgri/catalog/wcs.py,sha256=mD6bZxiBxKYpuYCl8f2tSCc8uuWFzMRL2jf5SuFAhfg,5562
 isgri/cli/__init__.py,sha256=SCIcTdOvfEkrZd1doOtOnvCj8PmdRuXu18YYJQxfFrs,24
 isgri/cli/builder.py,sha256=dCp9ECl9MoThTRXAkXXazafHYSMQF0FLHKDzlWwT7vE,3494
-isgri/cli/main.py,sha256=SQxx1NdYQ7WjLINgvtyO4-rPdcVLhXnixU00pDqgVg8,6436
-isgri/cli/query.py,sha256=jIAJ8Ghr73OivSIqTjqYE-y-gn9hw4-QpEeH-z6Bny0,8012
+isgri/cli/main.py,sha256=gOK8UDOviwb_o4YqhnZY_zsytNxNe7NZNWD7yu1rSrM,6883
+isgri/cli/query.py,sha256=o2AV8pwLNgRL2goAppVT0z_gZApLy5_5CjtzA4iqYs8,9830
 isgri/utils/__init__.py,sha256=H83Al7urc6LNW5KUzUBRdtRBUTahiZmkehKFiK90RrU,183
 isgri/utils/file_loaders.py,sha256=E4-0QA6r1QAX1gV1Dd5qhKPDXZIdSEk7AWdOQrovHGo,17423
 isgri/utils/lightcurve.py,sha256=v_JNLzf1SBvFLzrU7ZXpSj44eRKaZChiO4gvS2_O35Y,17408
 isgri/utils/pif.py,sha256=sAtzQhe3spLS41UkP1yZsqGPxe3IHLmIGA_d3bVg2v4,9121
 isgri/utils/quality.py,sha256=7CbYaNstoX60AYz2_ym-xjMkiDLpkYgQfaTStYuQZtk,13409
 isgri/utils/time_conversion.py,sha256=MNPVjrsrmwRDbCWmqdWN0xRs8PtHkFGli-H2cYwF9Ns,5204
-isgri-0.7.1.dist-info/METADATA,sha256=1Wi7eyxKCtpzFek7iCRLI_JaQqsiPiEdxRWZiOQeF_o,6499
-isgri-0.7.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-isgri-0.7.1.dist-info/entry_points.txt,sha256=aM2K4RGihbwsj9crjPG-BvWhErcdtZt3tJqT6AaOojU,46
-isgri-0.7.1.dist-info/licenses/LICENSE,sha256=Q8oxmHR1cSnEXSHCjY3qeXMtupZI_1ZQZ1MBt4oeANE,1102
-isgri-0.7.1.dist-info/RECORD,,
+isgri-0.7.2.dist-info/METADATA,sha256=Z3bs7SF2VmrGBMBjBSZGcLorkqRj4ild1NFDOpY6B1c,6499
+isgri-0.7.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+isgri-0.7.2.dist-info/entry_points.txt,sha256=aM2K4RGihbwsj9crjPG-BvWhErcdtZt3tJqT6AaOojU,46
+isgri-0.7.2.dist-info/licenses/LICENSE,sha256=Q8oxmHR1cSnEXSHCjY3qeXMtupZI_1ZQZ1MBt4oeANE,1102
+isgri-0.7.2.dist-info/RECORD,,