@@ -76,14 +76,11 @@ def applyOptions(process, options, applyToModules=False):
7676 process .TritonService .fallback .instanceBaseName = options .fallbackName
7777 if len (options .address )> 0 :
7878 process .TritonService .servers .append (
79- cms .PSet (
80- name = cms .untracked .string (options .serverName ),
81- address = cms .untracked .string (options .address ),
82- port = cms .untracked .uint32 (options .port ),
83- useSsl = cms .untracked .bool (options .ssl ),
84- rootCertificates = cms .untracked .string ("" ),
85- privateKey = cms .untracked .string ("" ),
86- certificateChain = cms .untracked .string ("" ),
79+ dict (
80+ name = options .serverName ,
81+ address = options .address ,
82+ port = options .port ,
83+ useSsl = options .ssl ,
8784 )
8885 )
8986
@@ -107,9 +104,9 @@ def applyClientOptions(client, options):
107104def configureModules (process , modules = None , returnConfigured = False , ** kwargs ):
108105 if modules is None :
109106 modules = {}
110- modules .update (process ._Process__producers )
111- modules .update (process ._Process__filters )
112- modules .update (process ._Process__analyzers )
107+ modules .update (process .producers_ () )
108+ modules .update (process .filters_ () )
109+ modules .update (process .analyzers_ () )
113110 configured = []
114111 for pname ,producer in modules .items ():
115112 if hasattr (producer ,'Client' ):
@@ -144,13 +141,11 @@ def configureLogging(process, client=False, server=False, service=False, discove
144141 for module in configured :
145142 keepMsgs .extend ([module , module + ':TritonClient' ])
146143
147- if not hasattr (process ,'MessageLogger' ):
148- process .load ('FWCore/MessageService/MessageLogger_cfi' )
149144 process .MessageLogger .cerr .FwkReport .reportEvery = 500
150145 for msg in keepMsgs :
151146 setattr (process .MessageLogger .cerr , msg ,
152- cms . untracked . PSet (
153- limit = cms . untracked . int32 ( 10000000 ) ,
147+ dict (
148+ limit = 10000000 ,
154149 )
155150 )
156151
0 commit comments