Clean up the script stuff

	modified:   README.rst
	modified:   doc/scripts/write_script_help.py
	modified:   obstools/__init__.py
	modified:   obstools/deveny_collfocus.py
	modified:   obstools/deveny_grangle.py
	modified:   obstools/dfocus.py
	modified:   obstools/fix_ldt_header.py
	modified:   obstools/lmi_etc.py
	modified:   obstools/neocp_ephem.py
	modified:   obstools/scrub_deveny_pickup.py
	modified:   obstools/utils.py

Author: tbowers7

README.rst

@@ -157,16 +157,16 @@ simply be a matter of executing:
 Optional Dependencies
 ^^^^^^^^^^^^^^^^^^^^^
 
-There are no optional dependencies at this time.
+.. There are no optional dependencies at this time.
 
-.. Some of the instrument-specific routines in this package require additional dependencies
-.. that are not otherwise needed by the majority of the routines herein.
+Some of the instrument-specific routines in this package require additional dependencies
+that are not otherwise needed by the majority of the routines herein.
 
-..    - If you are using the ``deveny_pickup_cleaner`` routine, you will need the
-..      spectroscopic data reduction pipeline PypeIt for the iterative cleaning of
-..      the pickup noise.  It can be installed by including it in the optional
-..      dependencies, `e.g.`:
+   - If you are using the ``scrub_deveny_pickup`` tool, you will need the
+     spectroscopic data reduction pipeline `PypeIt <https://pypeit.readthedocs.io/en/release/>`_
+     for the iterative cleaning of the pickup noise.  It can be installed by
+     including it in the optional dependencies, *e.g.*:
 
-..       .. code-block:: console
+      .. code-block:: console
 
-..         pip install "obstools[pypeit] @ git+https://github.com/LowellObservatory/LDTObserverTools"
+        pip install "obstools[pypeit] @ git+https://github.com/LowellObservatory/LDTObserverTools"

doc/scripts/write_script_help.py

@@ -35,7 +35,7 @@ def write_help(script_cls: utils.ScriptBase, opath: pathlib.Path, width: int = 8
     width : :obj:`int`, optional
         The width of the help text before wrapping  (Default: 80)
     """
-    exe = script_cls.name()
+    exe = script_cls.name
     ofile = os.path.join(opath, f"{exe}.rst")
     lines = [".. code-block:: console", ""]
     lines += [f"    $ {exe} -h"]

obstools/__init__.py

@@ -29,7 +29,8 @@
     from obstools import neocp_ephem
     from obstools import scrub_deveny_pickup
 except ImportError as err:
-    print(f"Had an import error!  {err}")
+    pass
+
 
 def short_warning(message, category, filename, lineno, file=None, line=None):
     """
@@ -58,17 +59,10 @@ def script_classes() -> dict:
     from obstools import utils
 
     # Recursively collect all subclasses
-    # Since we use PypeIt's ScriptBase, remove all classes from that package
-    scr_class = np.array(
-        [
-            cls
-            for cls in list(utils.all_subclasses(utils.ScriptBase))
-            if "pypeit" not in cls.name()
-        ]
-    )
+    scr_class = np.array(list(utils.all_subclasses(utils.ScriptBase)))
     print(scr_class)
 
-    scr_name = np.array([c.name() for c in scr_class])
+    scr_name = np.array([c.name for c in scr_class])
     # Construct a dictionary with the script name and class
     srt = np.argsort(scr_name)
     return dict(zip(scr_name[srt], scr_class[srt]))

obstools/deveny_collfocus.py

@@ -310,14 +310,6 @@ class DevenyCollfocus(utils.ScriptBase):
     Script structure borrowed from :class:`pypeit.scripts.scriptbase.ScriptBase`.
     """
 
-    @classmethod
-    def name(cls):
-        """
-        Provide the name of the script.  By default, this is the name of the
-        module.
-        """
-        return f"{cls.__module__.rsplit('.', maxsplit=1)[-1]}"
-
     @classmethod
     def get_parser(cls, width=None):
         """Construct the command-line argument parser.

obstools/deveny_grangle.py

@@ -379,14 +379,6 @@ class DevenyGrangle(utils.ScriptBase):
     Script structure borrowed from :class:`pypeit.scripts.scriptbase.ScriptBase`.
     """
 
-    @classmethod
-    def name(cls):
-        """
-        Provide the name of the script.  By default, this is the name of the
-        module.
-        """
-        return f"{cls.__module__.rsplit('.', maxsplit=1)[-1]}"
-
     @classmethod
     def get_parser(cls, width=None):
         """Construct the command-line argument parser.

obstools/dfocus.py

@@ -856,14 +856,6 @@ class DFocus(utils.ScriptBase):
     Script structure borrowed from :class:`pypeit.scripts.scriptbase.ScriptBase`.
     """
 
-    @classmethod
-    def name(cls):
-        """
-        Provide the name of the script.  By default, this is the name of the
-        module.
-        """
-        return f"{cls.__module__.rsplit('.', maxsplit=1)[-1]}"
-
     @classmethod
     def get_parser(cls, width=None):
         """Construct the command-line argument parser.

obstools/fix_ldt_header.py

@@ -71,14 +71,6 @@ class FixLdtHeader(utils.ScriptBase):
     Script structure borrowed from :class:`pypeit.scripts.scriptbase.ScriptBase`.
     """
 
-    @classmethod
-    def name(cls):
-        """
-        Provide the name of the script.  By default, this is the name of the
-        module.
-        """
-        return f"{cls.__module__.rsplit('.', maxsplit=1)[-1]}"
-
     @classmethod
     def get_parser(cls, width=None):
         """Construct the command-line argument parser.

obstools/lmi_etc.py

@@ -535,14 +535,6 @@ class LmiEtc(utils.ScriptBase):
     Script structure borrowed from :class:`pypeit.scripts.scriptbase.ScriptBase`.
     """
 
-    @classmethod
-    def name(cls):
-        """
-        Provide the name of the script.  By default, this is the name of the
-        module.
-        """
-        return f"{cls.__module__.rsplit('.', maxsplit=1)[-1]}"
-
     @classmethod
     def get_parser(cls, width=None):
         """Construct the command-line argument parser.

obstools/neocp_ephem.py

@@ -190,14 +190,6 @@ class NeocpEphem(utils.ScriptBase):
     Script structure borrowed from :class:`pypeit.scripts.scriptbase.ScriptBase`.
     """
 
-    @classmethod
-    def name(cls):
-        """
-        Provide the name of the script.  By default, this is the name of the
-        module.
-        """
-        return f"{cls.__module__.rsplit('.', maxsplit=1)[-1]}"
-
     @classmethod
     def get_parser(cls, width=None):
         """Construct the command-line argument parser.

obstools/scrub_deveny_pickup.py

@@ -1614,14 +1614,6 @@ class ScrubDevenyPickup(utils.ScriptBase):
     Script structure borrowed from :class:`pypeit.scripts.scriptbase.ScriptBase`.
     """
 
-    @classmethod
-    def name(cls):
-        """
-        Provide the name of the script.  By default, this is the name of the
-        module.
-        """
-        return f"{cls.__module__.rsplit('.', maxsplit=1)[-1]}"
-
     @classmethod
     def get_parser(cls, width=None):
         """Construct the command-line argument parser.

obstools/utils.py

@@ -505,7 +505,6 @@ def warn_and_return_zeros(return_full: bool, x, xx, yy, order, raise_warn=False)
 """
 
 
-
 class SmartFormatter(argparse.HelpFormatter):
     r"""
     Enable a combination of both fixed-format and wrappable lines to be
@@ -617,9 +616,9 @@ def entry_point(cls):
     def name(cls):
         """
         Provide the name of the script.  By default, this is the name of the
-        module with "pypeit" prepended.
+        module.
         """
-        return f"pypeit_{cls.__module__.split('.')[-1]}"
+        return f"{cls.__module__.rsplit('.', maxsplit=1)[-1]}"
 
     @classmethod
     def parse_args(cls, options=None):
@@ -629,7 +628,9 @@ def parse_args(cls, options=None):
         parser = cls.get_parser()
         ScriptBase._fill_parser_cwd(parser)
         # Add "--version" to bottom of all scripts
-        parser.add_argument("--version", action="store_true", help="Print version and exit")
+        parser.add_argument(
+            "--version", action="store_true", help="Print version and exit"
+        )
         return parser.parse_args() if options is None else parser.parse_args(options)
 
     @staticmethod