From 6150cc075a2bba76f85aeaab3a7d29ab546644bf Mon Sep 17 00:00:00 2001
From: Hsin-Fang Chiang <hchiang@lsst.org>
Date: Thu, 14 Nov 2024 15:45:13 -0800
Subject: [PATCH] Revert "Ingest LSSTCam photodiode data"

This reverts commit 958273e3793d519c4a9ad73954fc42a99d05f98b.
---
 src/info.py   |  5 +----
 src/ingest.py | 41 +----------------------------------------
 2 files changed, 2 insertions(+), 44 deletions(-)

diff --git a/src/info.py b/src/info.py
index 567e4a7..1867611 100644
--- a/src/info.py
+++ b/src/info.py
@@ -146,12 +146,9 @@ def __init__(self, path):
                 self.instrument = f"{csc}/{generator}"
             elif len(components) == 6:
                 self.bucket, self.instrument, year, month, day, self.filename = components
-            elif len(components) == 5:  # photodiode data
-                self.bucket, self.instrument, data_type, self.obs_day, self.filename = components
             else:
                 raise ValueError(f"Unrecognized number of components: {len(components)}")
-            if not self.obs_day:
-                self.obs_day = f"{year}{month}{day}"
+            self.obs_day = f"{year}{month}{day}"
         except Exception:
             logger.exception("Unable to parse: %s", path)
             raise
diff --git a/src/ingest.py b/src/ingest.py
index 547df41..912e351 100644
--- a/src/ingest.py
+++ b/src/ingest.py
@@ -24,16 +24,13 @@
 """
 import json
 import os
-import re
 import socket
 import time
 
 import astropy.io.fits
 import requests
 from lsst.daf.butler import Butler
-from lsst.pipe.base import Instrument
 from lsst.obs.base import DefineVisitsTask, RawIngestTask
-from lsst.obs.lsst import PhotodiodeIngestTask
 from lsst.resources import ResourcePath
 
 from info import Info
@@ -203,18 +200,7 @@ def main():
         on_metadata_failure=on_metadata_failure,
     )
 
-    if is_lfa:
-        # LSSTCam photodiode is copy mode only.
-        instrument = Instrument.from_string("LSSTCam", butler.registry)
-        lsstcam_photodiode_ingester = PhotodiodeIngestTask(
-            config=PhotodiodeIngestTask.ConfigClass(),
-            butler=butler,
-            instrument=instrument,
-            on_success=on_success,
-            on_ingest_failure=on_ingest_failure,
-            on_metadata_failure=on_metadata_failure,
-        )
-    else:
+    if not is_lfa:
         define_visits_config = DefineVisitsTask.ConfigClass()
         define_visits_config.groupExposures = "one-to-one"
         visit_definer = DefineVisitsTask(config=define_visits_config, butler=butler)
@@ -234,15 +220,6 @@ def main():
 
                 logger.info("Ingesting %s", resources)
                 refs = None
-                if is_lfa:
-                    resources_photodiode = []
-                    resources_others = []
-                    for resource in resources:
-                        if re.search(r"MTCamera/photodiode.*_photodiode.ecsv", resource):
-                            resources_photodiode.append(resource)
-                        else:
-                            resources_others.append(resource)
-                    resources = resources_others
                 try:
                     refs = ingester.run(resources)
                 except Exception:
@@ -256,22 +233,6 @@ def main():
                             info = Info.from_path(resource.geturl())
                             r.lrem(worker_queue, 0, info.path)
 
-                if is_lfa and resources_photodiode:
-                    try:
-                        refs = lsstcam_photodiode_ingester.run(resources_photodiode)
-                    except Exception:
-                        logger.exception(
-                            "Error while ingesting %s, retrying one by one", resources_photodiode
-                        )
-                        refs = []
-                        for resource in resources_photodiode:
-                            try:
-                                refs.extend(lsstcam_photodiode_ingester.run([resource]))
-                            except Exception:
-                                logger.exception("Error while ingesting %s", resource)
-                                info = Info.from_path(resource.geturl())
-                                r.lrem(worker_queue, 0, info.path)
-
                 # Define visits if we ingested anything
                 if not is_lfa and refs:
                     ids = [ref.dataId for ref in refs]