Merge pull request #695 from OSU-CMS/useRhApiClass

Use RhApi class instead of using subprocesses

Author: mlj5j

Gui/python/CentralDBInterface.py

@@ -1,18 +1,25 @@
 import os
+from Gui.python.rhapi import RhApi
 
+
+#FIXME: Add the login part of the api.
 def DCA_login():
     DB_login_command = f'python python/rhapi.py --login --no-save-password --clean -u https://cmsdca.cern.ch/trk_rhapi1'
     DB_login_output = os.popen(DB_login_command).read()
     return DB_login_output.strip("\n")
 def ExtractChipData(chipserial):
-    DB_interface_step1 = f'''python python/rhapi.py --login --no-save-password --clean -u https://cmsdca.cern.ch/trk_rhapi1 "select c.* from trker_cmsr.c18220 c where c.PART_NAME_LABEL = '{chipserial}'"'''
-    DB_interface_step2 = f'''python python/rhapi.py --login --no-save-password --clean -u https://cmsdca.cern.ch/trk_rhapi1 "select c.CROC_DATA_ID, c.Y from trker_cmsr.c18240 c where c.PART_NAME_LABEL = '{chipserial}' and c.CROC_DATA_ID like 'DAC_%_LIN' and c.X = 0"'''
-    chipdataoutput_step1 = os.popen(DB_interface_step1).read()
+    api = RhApi(url="https://cmsdca.cern.ch/trk_rhapi1", sso="login", save_password=False)
+    chipdataoutput_step1 = api.data(api.qid("select c.* from trker_cmsr.c18220 c where c.PART_NAME_LABEL = '{}'".format(chipserial)))
+    
+    #DB_interface_step1 = f'''python python/rhapi.py --login --no-save-password --clean -u https://cmsdca.cern.ch/trk_rhapi1 "select c.* from trker_cmsr.c18220 c where c.PART_NAME_LABEL = '{chipserial}'"'''
+    #DB_interface_step2 = f'''python python/rhapi.py --login --no-save-password --clean -u https://cmsdca.cern.ch/trk_rhapi1 "select c.CROC_DATA_ID, c.Y from trker_cmsr.c18240 c where c.PART_NAME_LABEL = '{chipserial}' and c.CROC_DATA_ID like 'DAC_%_LIN' and c.X = 0"'''
+    #chipdataoutput_step1 = os.popen(DB_interface_step1).read()
     chipdataoutput_step1 = chipdataoutput_step1.split("\n")
     datelabel_step1 = chipdataoutput_step1[0].split(",")
     datavalue_step1 = chipdataoutput_step1[1].split(",")
     chipdata_step1 = dict(zip(datelabel_step1, datavalue_step1))
-    chipdataoutput = os.popen(DB_interface_step2).read()
+    chipdataoutput = api.data(api.qid("select c.CROC_DATA_ID, c.Y from trker_cmsr.c18240 c where c.PART_NAME_LABEL = '{}' and c.CROC_DATA_ID like 'DAC_%_LIN' and c.X = 0".format(chipserial)))
+    #chipdataoutput = os.popen(DB_interface_step2).read()
     chipdataoutput = chipdataoutput.split("\n")
     chipdata = {}
     for entry in chipdataoutput: