ViewVC Help
View File | Revision Log | Show Annotations | Root Listing
root/cvsroot/COMP/CRAB/python/PsetManipulator.py
(Generate patch)

Comparing COMP/CRAB/python/PsetManipulator.py (file contents):
Revision 1.16 by ewv, Wed Apr 30 17:03:57 2008 UTC vs.
Revision 1.19 by slacapra, Mon Jun 16 14:02:36 2008 UTC

# Line 31 | Line 31 | class PsetManipulator:
31              try:   # Nested form for Python < 2.5
32                  try:
33                      self.cfo = imp.load_source("pycfg", self.pset, handle)
34 +                    self.cmsProcess = self.cfo.process
35                  except Exception, ex:
36                      msg = "Your config file is not valid python: %s" % str(ex)
37                      raise CrabException(msg)
38              finally:
39                  handle.close()
39            self.cfg = CfgInterface(self.cfo.process)
40          else:
41              try:
42                  self.cfo = include(self.pset)
43 <                self.cfg = CfgInterface(self.cfo)
43 >                self.cmsProcess = self.cfo
44              except Exception, ex:
45                  msg =  "Your cfg file is not valid, %s\n" % str(ex)
46                  msg += "  https://twiki.cern.ch/twiki/bin/view/CMS/CrabFaq#Problem_with_ParameterSet_parsin\n"
47                  msg += "  may help you understand the problem."
48                  raise CrabException(msg)
49 +        self.cfg = CfgInterface(self.cmsProcess)
50  
51      def maxEvent(self, maxEv):
52          """
# Line 62 | Line 63 | class PsetManipulator:
63          # FUTURE: Can drop cfg mode for CMSSW < 2_1_x
64          outFile = open(common.work_space.jobDir()+name,"w")
65          if name.endswith('py'):
66 <          outFile.write("import FWCore.ParameterSet.Config as cms\n")
67 <          outFile.write(self.cfo.dumpPython())
66 >            outFile.write("import FWCore.ParameterSet.Config as cms\n")
67 >            outFile.write(self.cmsProcess.dumpPython())
68          else:
69 <          outFile.write(str(self.cfg))
69 >            outFile.write(str(self.cfg))
70          outFile.close()
71  
72          return
# Line 96 | Line 97 | class PsetManipulator:
97              messageLogger.fwkJobReports.append(name)
98  
99          return
100 +
101 +    def getTFileService(self):
102 +        """ Get Output filename from TFileService and return it. If not existing, return None """
103 +        if not self.cfg.data.services.has_key('TFileService'):
104 +            return None
105 +        tFileService = self.cfg.data.services['TFileService']
106 +        if "fileName" in tFileService.parameterNames_():
107 +            fileName = getattr(tFileService,'fileName',None).value()
108 +            return fileName
109 +        return None
110 +        
111 +    def getPoolOutputModule(self):
112 +        """ Get Output filename from PoolOutputModule and return it. If not existing, return None """
113 +        return None
114 +        # if not self.cfg.data.outputModules:
115 +        #     return None
116 +        # poolOutputModule = self.cfg.data.outputModules
117 +        # for out in poolOutputModule:
118 +        #     print out
119 +        # fileName = poolOutputModule.getattr(poolOutputModule.values()[0],'fileName', None)
120 +        # return fileName
121 +

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines