From e21bc5ea86726fb04498862f070fd14e422c10e6 Mon Sep 17 00:00:00 2001
From: edennihy <edennihy@lsst.org>
Date: Mon, 18 Nov 2024 13:56:42 -0700
Subject: [PATCH] MTScheduler: fix rebase issue with BLOCK-T277.json

---
 .../observing_blocks_maintel/BLOCK-T277.json  | 537 ++++++------------
 1 file changed, 179 insertions(+), 358 deletions(-)

diff --git a/Scheduler/observing_blocks_maintel/BLOCK-T277.json b/Scheduler/observing_blocks_maintel/BLOCK-T277.json
index 0a172afe..3b8662ef 100644
--- a/Scheduler/observing_blocks_maintel/BLOCK-T277.json
+++ b/Scheduler/observing_blocks_maintel/BLOCK-T277.json
@@ -1,365 +1,186 @@
 {
-<<<<<<< HEAD
     "name": "BLOCK-T277",
     "program": "BLOCK-T277",
     "constraints": [],
     "scripts": [
-      {
-        "name": "maintel/take_image_comcam.py",
-        "standard": true,
-        "parameters": {
-          "program": "$program",
-          "reason": "linear_dither",
-          "filter": "z_03",
-          "image_type": "ACQ",
-          "exp_times": 30.0
+        {
+            "name": "maintel/take_image_comcam.py",
+            "standard": true,
+            "parameters": {
+                "program": "$program",
+                "reason": "linear_dither",
+                "filter": "z_03",
+                "image_type": "ACQ",
+                "exp_times": 30.0
+            }
+        },
+        {
+            "name": "maintel/offset_mtcs.py",
+            "standard": true,
+            "parameters": {
+                "offset_xy": {
+                    "x": 60.0,
+                    "y": 60.0
+                }
+            }
+        },
+        {
+            "name": "maintel/take_image_comcam.py",
+            "standard": true,
+            "parameters": {
+                "program": "$program",
+                "reason": "linear_dither",
+                "filter": "z_03",
+                "image_type": "ACQ",
+                "exp_times": 30.0
+            }
+        },
+        {
+            "name": "maintel/offset_mtcs.py",
+            "standard": true,
+            "parameters": {
+                "offset_xy": {
+                    "x": 60.0,
+                    "y": 60.0
+                }
+            }
+        },
+        {
+            "name": "maintel/take_image_comcam.py",
+            "standard": true,
+            "parameters": {
+                "program": "$program",
+                "reason": "linear_dither",
+                "filter": "z_03",
+                "image_type": "ACQ",
+                "exp_times": 30.0
+            }
+        },
+        {
+            "name": "maintel/take_image_comcam.py",
+            "standard": true,
+            "parameters": {
+                "program": "$program",
+                "reason": "linear_dither",
+                "filter": "r_03",
+                "image_type": "ACQ",
+                "exp_times": 30.0
+            }
+        },
+        {
+            "name": "maintel/offset_mtcs.py",
+            "standard": true,
+            "parameters": {
+                "offset_xy": {
+                    "x": -60.0,
+                    "y": -60.0
+                }
+            }
+        },
+        {
+            "name": "maintel/take_image_comcam.py",
+            "standard": true,
+            "parameters": {
+                "program": "$program",
+                "reason": "linear_dither",
+                "filter": "r_03",
+                "image_type": "ACQ",
+                "exp_times": 30.0
+            }
+        },
+        {
+            "name": "maintel/offset_mtcs.py",
+            "standard": true,
+            "parameters": {
+                "offset_xy": {
+                    "x": -60.0,
+                    "y": -60.0
+                }
+            }
+        },
+        {
+            "name": "maintel/take_image_comcam.py",
+            "standard": true,
+            "parameters": {
+                "program": "$program",
+                "reason": "linear_dither",
+                "filter": "r_03",
+                "image_type": "ACQ",
+                "exp_times": 30.0
+            }
+        },
+        {
+            "name": "maintel/take_image_comcam.py",
+            "standard": true,
+            "parameters": {
+                "program": "$program",
+                "reason": "linear_dither",
+                "filter": "i_06",
+                "image_type": "ACQ",
+                "exp_times": 30.0
+            }
+        },
+        {
+            "name": "maintel/offset_mtcs.py",
+            "standard": true,
+            "parameters": {
+                "offset_xy": {
+                    "x": 60.0,
+                    "y": 60.0
+                }
+            }
+        },
+        {
+            "name": "maintel/take_image_comcam.py",
+            "standard": true,
+            "parameters": {
+                "program": "$program",
+                "reason": "linear_dither",
+                "filter": "i_06",
+                "image_type": "ACQ",
+                "exp_times": 30.0
+            }
+        },
+        {
+            "name": "maintel/offset_mtcs.py",
+            "standard": true,
+            "parameters": {
+                "offset_xy": {
+                    "x": 60.0,
+                    "y": 60.0
+                }
+            }
+        },
+        {
+            "name": "maintel/take_image_comcam.py",
+            "standard": true,
+            "parameters": {
+                "program": "$program",
+                "reason": "linear_dither",
+                "filter": "i_06",
+                "image_type": "ACQ",
+                "exp_times": 30.0
+            }
+        },
+        {
+            "name": "maintel/offset_mtcs.py",
+            "standard": true,
+            "parameters": {
+                "offset_xy": {
+                    "x": -60.0,
+                    "y": -60.0
+                }
+            }
+        },
+        {
+            "name": "maintel/offset_mtcs.py",
+            "standard": true,
+            "parameters": {
+                "offset_xy": {
+                    "x": -60.0,
+                    "y": -60.0
+                }
+            }
         }
-      },
-      {
-        "name": "maintel/offset_mtcs.py",
-        "standard": true,
-        "parameters": {
-          "offset_xy": {
-            "x": 60.0,
-            "y": 60.0
-          }
-        }
-      },
-      {
-        "name": "maintel/take_image_comcam.py",
-        "standard": true,
-        "parameters": {
-          "program": "$program",
-          "reason": "linear_dither",
-          "filter": "z_03",
-          "image_type": "ACQ",
-          "exp_times": 30.0
-        }
-      },
-      {
-        "name": "maintel/offset_mtcs.py",
-        "standard": true,
-        "parameters": {
-          "offset_xy": {
-            "x": 60.0,
-            "y": 60.0
-          }
-        }
-      },
-      {
-        "name": "maintel/take_image_comcam.py",
-        "standard": true,
-        "parameters": {
-          "program": "$program",
-          "reason": "linear_dither",
-          "filter": "z_03",
-          "image_type": "ACQ",
-          "exp_times": 30.0
-        }
-      },
-      {
-        "name": "maintel/take_image_comcam.py",
-        "standard": true,
-        "parameters": {
-          "program": "$program",
-          "reason": "linear_dither",
-          "filter": "r_03",
-          "image_type": "ACQ",
-          "exp_times": 30.0
-        }
-      },
-      {
-        "name": "maintel/offset_mtcs.py",
-        "standard": true,
-        "parameters": {
-          "offset_xy": {
-            "x": -60.0,
-            "y": -60.0
-          }
-        }
-      },
-      {
-        "name": "maintel/take_image_comcam.py",
-        "standard": true,
-        "parameters": {
-          "program": "$program",
-          "reason": "linear_dither",
-          "filter": "r_03",
-          "image_type": "ACQ",
-          "exp_times": 30.0
-        }
-      },
-      {
-        "name": "maintel/offset_mtcs.py",
-        "standard": true,
-        "parameters": {
-          "offset_xy": {
-            "x": -60.0,
-            "y": -60.0
-          }
-        }
-      },
-      {
-        "name": "maintel/take_image_comcam.py",
-        "standard": true,
-        "parameters": {
-          "program": "$program",
-          "reason": "linear_dither",
-          "filter": "r_03",
-          "image_type": "ACQ",
-          "exp_times": 30.0
-        }
-      },
-      {
-        "name": "maintel/take_image_comcam.py",
-        "standard": true,
-        "parameters": {
-          "program": "$program",
-          "reason": "linear_dither",
-          "filter": "i_06",
-          "image_type": "ACQ",
-          "exp_times": 30.0
-        }
-      },
-      {
-        "name": "maintel/offset_mtcs.py",
-        "standard": true,
-        "parameters": {
-          "offset_xy": {
-            "x": 60.0,
-            "y": 60.0
-          }
-        }
-      },
-      {
-        "name": "maintel/take_image_comcam.py",
-        "standard": true,
-        "parameters": {
-          "program": "$program",
-          "reason": "linear_dither",
-          "filter": "i_06",
-          "image_type": "ACQ",
-          "exp_times": 30.0
-        }
-      },
-      {
-        "name": "maintel/offset_mtcs.py",
-        "standard": true,
-        "parameters": {
-          "offset_xy": {
-            "x": 60.0,
-            "y": 60.0
-          }
-        }
-      },
-      {
-        "name": "maintel/take_image_comcam.py",
-        "standard": true,
-        "parameters": {
-          "program": "$program",
-          "reason": "linear_dither",
-          "filter": "i_06",
-          "image_type": "ACQ",
-          "exp_times": 30.0
-        }
-      },
-      {
-        "name": "maintel/offset_mtcs.py",
-        "standard": true,
-        "parameters": {
-          "offset_xy": {
-            "x": -60.0,
-            "y": -60.0
-          }
-        }
-      },
-      {
-        "name": "maintel/offset_mtcs.py",
-        "standard": true,
-        "parameters": {
-          "offset_xy": {
-            "x": -60.0,
-            "y": -60.0
-          }
-        }
-      }
     ]
-  }
-=======
-  "name": "BLOCK-T277",
-  "program": "BLOCK-T277",
-  "constraints": [],
-  "scripts": [
-    {
-      "name": "maintel/take_image_comcam.py",
-      "standard": true,
-      "parameters": {
-        "program": "$program",
-        "reason": "linear_dither",
-        "filter": "u_02",
-        "image_type": "ACQ",
-        "exp_times": 30.0
-      }
-    },
-    {
-      "name": "maintel/offset_mtcs.py",
-      "standard": true,
-      "parameters": {
-        "offset_xy": {
-          "x": 60.0,
-          "y": 60.0
-        }
-      }
-    },
-    {
-      "name": "maintel/take_image_comcam.py",
-      "standard": true,
-      "parameters": {
-        "program": "$program",
-        "reason": "linear_dither",
-        "filter": "u_02",
-        "image_type": "ACQ",
-        "exp_times": 30.0
-      }
-    },
-    {
-      "name": "maintel/offset_mtcs.py",
-      "standard": true,
-      "parameters": {
-        "offset_xy": {
-          "x": 60.0,
-          "y": 60.0
-        }
-      }
-    },
-    {
-      "name": "maintel/take_image_comcam.py",
-      "standard": true,
-      "parameters": {
-        "program": "$program",
-        "reason": "linear_dither",
-        "filter": "u_02",
-        "image_type": "ACQ",
-        "exp_times": 30.0
-      }
-    },
-    {
-      "name": "maintel/take_image_comcam.py",
-      "standard": true,
-      "parameters": {
-        "program": "$program",
-        "reason": "linear_dither",
-        "filter": "r_03",
-        "image_type": "ACQ",
-        "exp_times": 30.0
-      }
-    },
-    {
-      "name": "maintel/offset_mtcs.py",
-      "standard": true,
-      "parameters": {
-        "offset_xy": {
-          "x": -60.0,
-          "y": -60.0
-        }
-      }
-    },
-    {
-      "name": "maintel/take_image_comcam.py",
-      "standard": true,
-      "parameters": {
-        "program": "$program",
-        "reason": "linear_dither",
-        "filter": "r_03",
-        "image_type": "ACQ",
-        "exp_times": 30.0
-      }
-    },
-    {
-      "name": "maintel/offset_mtcs.py",
-      "standard": true,
-      "parameters": {
-        "offset_xy": {
-          "x": -60.0,
-          "y": -60.0
-        }
-      }
-    },
-    {
-      "name": "maintel/take_image_comcam.py",
-      "standard": true,
-      "parameters": {
-        "program": "$program",
-        "reason": "linear_dither",
-        "filter": "r_03",
-        "image_type": "ACQ",
-        "exp_times": 30.0
-      }
-    },
-    {
-      "name": "maintel/take_image_comcam.py",
-      "standard": true,
-      "parameters": {
-        "program": "$program",
-        "reason": "linear_dither",
-        "filter": "i_06",
-        "image_type": "ACQ",
-        "exp_times": 30.0
-      }
-    },
-    {
-      "name": "maintel/offset_mtcs.py",
-      "standard": true,
-      "parameters": {
-        "offset_xy": {
-          "x": 60.0,
-          "y": 60.0
-        }
-      }
-    },
-    {
-      "name": "maintel/take_image_comcam.py",
-      "standard": true,
-      "parameters": {
-        "program": "$program",
-        "reason": "linear_dither",
-        "filter": "i_06",
-        "image_type": "ACQ",
-        "exp_times": 30.0
-      }
-    },
-    {
-      "name": "maintel/offset_mtcs.py",
-      "standard": true,
-      "parameters": {
-        "offset_xy": {
-          "x": 60.0,
-          "y": 60.0
-        }
-      }
-    },
-    {
-      "name": "maintel/take_image_comcam.py",
-      "standard": true,
-      "parameters": {
-        "program": "$program",
-        "reason": "linear_dither",
-        "filter": "i_06",
-        "image_type": "ACQ",
-        "exp_times": 30.0
-      }
-    },
-    {
-      "name": "maintel/offset_mtcs.py",
-      "standard": true,
-      "parameters": {
-        "offset_xy": {
-          "x": -120.0,
-          "y": -120.0
-        }
-      }
-    }
-  ],
-  "configuration_schema": "$schema: http://json-schema.org/draft-07/schema#\ntitle: BLOCK-T277 configuration\ndescription: Configuration for BLOCK-T277.\ntype: object\nproperties:\n"
-}
->>>>>>> e205189 (Add linear dither block)
+}
\ No newline at end of file