Merge pull request #2342 from ganga-devs/smog_bk

Add SMOG options in BKQuery
ganga-devs · May 24, 2024 · e0cbeea · e0cbeea
2 parents 5596a5e + 1d12fcb
commit e0cbeea
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 13 deletions.
diff --git a/ganga/GangaLHCb/Lib/LHCbDataset/BKQuery.py b/ganga/GangaLHCb/Lib/LHCbDataset/BKQuery.py
@@ -98,6 +98,8 @@ class BKQuery(GangaObject):
     schema['check_archived'] = SimpleItem(defvalue=True, typelist=['bool'], doc='Check if the data set is archived')
     schema['ignore_archived'] = SimpleItem(defvalue=False, typelist=['bool'],
                                            doc='Return the data set, even if all the LFNs are archived')
+    schema['SMOG2'] = SimpleItem(defvalue='', typelist=['str', 'list'],
+                                 doc='Specify the state of SMOG2')
     _schema = Schema(Version(1, 2), schema)
     _category = 'query'
     _name = "BKQuery"
@@ -124,13 +126,13 @@ def getDatasetMetadata(self):
             if self.selection:
                 msg = 'selection not supported for type="%s".' % self.type
                 raise GangaException(msg)
-        cmd = "getDataset('%s','%s','%s','%s','%s','%s')" % (self.path, self.dqflag,
-                                                             self.type, self.startDate, self.endDate, self.selection)
+        cmd = "getDataset('%s','%s','%s','%s','%s','%s', '%s')" % (self.path, self.dqflag,
+                                                             self.type, self.startDate, self.endDate, self.selection, self.SMOG2)
         from GangaCore.GPIDev.Lib.GangaList.GangaList import GangaList
         knownLists = [tuple, list, GangaList]
         if isType(self.dqflag, knownLists):
-            cmd = "getDataset('%s',%s,'%s','%s','%s','%s')" % (self.path, self.dqflag,
-                                                               self.type, self.startDate, self.endDate, self.selection)
+            cmd = "getDataset('%s',%s,'%s','%s','%s','%s', '%s')" % (self.path, self.dqflag,
+                                                               self.type, self.startDate, self.endDate, self.selection, self.SMOG2)
 
         try:
             value = get_result(cmd, 'BK query error.', credential_requirements=self.credential_requirements)
@@ -167,13 +169,13 @@ def getDataset(self, compressed=True, SE=None):
             if self.selection:
                 msg = 'selection not supported for type="%s".' % self.type
                 raise GangaException(msg)
-        cmd = "getDataset('%s','%s','%s','%s','%s','%s')" % (self.path, self.dqflag,
-                                                             self.type, self.startDate, self.endDate, self.selection)
+        cmd = "getDataset('%s','%s','%s','%s','%s','%s', %s)" % (self.path, self.dqflag,
+                                                             self.type, self.startDate, self.endDate, self.selection, self.SMOG2)
         from GangaCore.GPIDev.Lib.GangaList.GangaList import GangaList
         knownLists = [tuple, list, GangaList]
         if isType(self.dqflag, knownLists):
-            cmd = "getDataset('%s',%s,'%s','%s','%s','%s')" % (self.path, self.dqflag, self.type, self.startDate,
-                                                               self.endDate, self.selection)
+            cmd = "getDataset('%s',%s,'%s','%s','%s','%s', %s)" % (self.path, self.dqflag, self.type, self.startDate,
+                                                               self.endDate, self.selection, self.SMOG2)
         result = get_result(cmd, 'BK query error.', credential_requirements=self.credential_requirements)
         logger.debug("Finished Running Command")
         files = []

diff --git a/ganga/GangaLHCb/Lib/Server/DiracLHCbCommands.py b/ganga/GangaLHCb/Lib/Server/DiracLHCbCommands.py
@@ -38,16 +38,16 @@ def bookkeepingGUI(file):
 
 
 @diracCommand
-def getDataset(path, dqflag, this_type, start, end, sel):
+def getDataset(path, dqflag, this_type, start, end, sel, smog=None):
     if this_type == 'Path':
-        result = dirac.bkQueryPath(path, dqflag)  # dirac
+        result = dirac.bkQueryPath(path, dqflag, SMOG2=smog)  # dirac
     elif this_type == 'RunsByDate':
         result = dirac.bkQueryRunsByDate(path, start, end,
-                                         dqflag, sel)  # dirac
+                                         dqflag, sel, SMOG2=smog)  # dirac
     elif this_type == 'Run':
-        result = dirac.bkQueryRun(path, dqflag)  # dirac
+        result = dirac.bkQueryRun(path, dqflag, SMOG2=smog)  # dirac
     elif this_type == 'Production':
-        result = dirac.bkQueryProduction(path, dqflag)  # dirac
+        result = dirac.bkQueryProduction(path, dqflag, SMOG2=smog)  # dirac
     else:
         result = {'OK': False, 'Message': 'Unsupported type!'}