fix: try ops and history MYA deployments

JeffersonLab · Nov 7, 2023 · bd51c04 · bd51c04
1 parent 8d5856e
commit bd51c04
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 9 deletions.
diff --git a/detectors/src/main/java/org/jlab/clas/timeline/timeline/epics/MYQuery.groovy b/detectors/src/main/java/org/jlab/clas/timeline/timeline/epics/MYQuery.groovy
@@ -3,10 +3,10 @@ package org.jlab.clas.timeline.timeline.epics
 class MYQuery {
 
   // MYA URL
-  def dbURL = 'https://epicsweb.jlab.org/myquery/interval'
+  private def dbURL = 'https://epicsweb.jlab.org/myquery/interval'
 
   // constant settings
-  def querySettings = [
+  public def querySettings = [
     't': 'eventsimple', // sampling type
     'f': '3',           // fractional time digits
     'v': '',            // significant figures
@@ -16,21 +16,21 @@ class MYQuery {
   ]
 
   // timestamps
-  def t0str, t1str
+  private def t0str, t1str
 
 
   // constructor
-  MYQuery() {
+  public MYQuery() {
   }
 
   // check if an object is null or empty
-  def checkObj(obj, msg) {
+  public def checkObj(obj, msg) {
     if(obj==null || obj.size()==0)
       throw new Exception(msg)
   }
 
   // get run start and stop times
-  def getRunTimeStamps(runlist) {
+  public def getRunTimeStamps(runlist) {
 
     // query RCDB
     def result = REST.get("https://clas12mon.jlab.org/rcdb/runs/time?runmin=${runlist.min()}&runmax=${runlist.max()}")
@@ -47,13 +47,29 @@ class MYQuery {
   }
 
   // query MYA database
-  def query(pvName, timeStart, timeStop, deployment) {
+  public def query(pvName) {
+    // try 'ops' deployment; if that fails, retry with 'history'
+    try {
+      def payload = queryDeployment(pvName, 'ops')
+      return payload
+    } catch(Exception ex) {
+      System.out.println("Cannot find PV='$pvName' in range '$t0str' to '$t1str' in 'ops' deployment; trying 'history' deployment...")
+    }
+    try {
+      def payload = queryDeployment(pvName, 'history')
+      return payload
+    } catch(Exception ex) {
+      System.out.println("... deployment 'history' failed too; throwing exception!")
+    }
+    throw new Exception("Cannot find PV='$pvName' in range '$t0str' to '$t1str' in MYA DB")
+  }
+  private def queryDeployment(pvName, deployment) {
 
     // build query URL
     querySettings['c'] = pvName     // channel (PV name)
     querySettings['b'] = t0str      // begin date
     querySettings['e'] = t1str      // end date
-    querySettings['d'] = deployment // MYA deployment
+    querySettings['m'] = deployment // MYA deployment
     queryStr = querySettings.collect{k,v->"$k=$v"}.join('&')
     queryURL = "${dbURL}?${queryStr}"
 

diff --git a/detectors/src/main/java/org/jlab/clas/timeline/timeline/epics/epics_xy.groovy b/detectors/src/main/java/org/jlab/clas/timeline/timeline/epics/epics_xy.groovy
@@ -23,7 +23,7 @@ class epics_xy {
     dateFormatStr = 'yyyy-MM-dd HH:mm:ss.SSS'
     def xs = MYQuery.query('IPM2H01.XPOS').each{ epics[new SimpleDateFormat(dateFormatStr).parse(it.d).getTime()].x = it.v }
     def ys = MYQuery.query('IPM2H01.YPOS').each{ epics[new SimpleDateFormat(dateFormatStr).parse(it.d).getTime()].y = it.v }
-    def is = MYQuery.query('IPM2H01').each{      epics[new SimpleDateFormat(dateFormatStr).parse(it.d).getTime()].y = it.v }
+    def is = MYQuery.query('IPM2H01').each{      epics[new SimpleDateFormat(dateFormatStr).parse(it.d).getTime()].i = it.v }
 
     println('dl finished')