Skip to content

Commit

Permalink
Merge pull request #24013 from davidlange6/printMig_180724T4_Validati…
Browse files Browse the repository at this point in the history
…on_RecoEgamma

Print function migration for Validation_RecoEgamma
  • Loading branch information
cmsbuild committed Jul 25, 2018
2 parents 9cea7cd + 3b2d49b commit 5ea59bf
Show file tree
Hide file tree
Showing 4 changed files with 33 additions and 29 deletions.
@@ -1,3 +1,4 @@
from __future__ import print_function

import sys
import os
Expand All @@ -21,7 +22,7 @@

# OLD WAY

print "reading files ..."
print("reading files ...")
max_number = -1 # number of events
process.maxEvents = cms.untracked.PSet(input = cms.untracked.int32(max_number))
process.source = cms.Source ("PoolSource",
Expand All @@ -38,7 +39,7 @@
]),
secondaryFileNames = cms.untracked.vstring() )
process.source.fileNames.extend(dd.search())
print "reading files done"
print("reading files done")

#process.printTree = cms.EDAnalyzer("ParticleListDrawer",
# maxEventsToPrint = cms.untracked.int32(1),
Expand Down Expand Up @@ -85,10 +86,10 @@
process.load("Validation.RecoEgamma.ElectronIsolation_cfi")
process.load("Validation.RecoEgamma.ElectronMcSignalValidatorMiniAOD_cfi")

print "miniAODElectronIsolation call"
print("miniAODElectronIsolation call")
from Validation.RecoEgamma.electronValidationSequenceMiniAOD_cff import miniAODElectronIsolation # as _ElectronIsolationCITK
process.miniAODElectronIsolation = miniAODElectronIsolation
print "miniAODElectronIsolation clone done"
print("miniAODElectronIsolation clone done")

# load DQM
process.load("DQMServices.Core.DQM_cfg")
Expand Down
@@ -1,11 +1,12 @@
from __future__ import print_function

import sys
import os
import DQMOffline.EGamma.electronDataDiscovery as dd
import FWCore.ParameterSet.Config as cms

print 'Number of arguments:', len(sys.argv), 'arguments.'
print 'Argument List:', str(sys.argv)
print('Number of arguments:', len(sys.argv), 'arguments.')
print('Argument List:', str(sys.argv))
# first arg : cmsRun
# second arg : name of the _cfg file
# third arg : sample name (ex. ZEE_14)
Expand Down
45 changes: 23 additions & 22 deletions Validation/RecoEgamma/test/electronValidationCheck_Env.py
@@ -1,6 +1,7 @@
#! /usr/bin/env python
#-*-coding: utf-8 -*-

from __future__ import print_function
import os,sys

class env:
Expand All @@ -9,11 +10,11 @@ def checkSample(self):
if ( len(sys.argv) > 2 ): # no else part since if sample does not exist, we had quit previously
sampleName = str(sys.argv[2])
os.environ['DD_SAMPLE'] = 'RelVal' + sampleName
print 'Sample name:', sampleName, ' - ', os.environ['DD_SAMPLE']
print('Sample name:', sampleName, ' - ', os.environ['DD_SAMPLE'])
else:
print '===================='
print 'no sample name, quit'
print '===================='
print('====================')
print('no sample name, quit')
print('====================')
quit()

def beginTag(self):
Expand Down Expand Up @@ -47,13 +48,13 @@ def dd_cond(self):
return dd_cond

def checkValues(self):
print '-----'
print self.dd_tier()
print self.tag_startup()
print self.data_version()
print self.test_global_tag()
print self.dd_cond()
print '-----'
print('-----')
print(self.dd_tier())
print(self.tag_startup())
print(self.data_version())
print(self.test_global_tag())
print(self.dd_cond())
print('-----')

os.environ['beginTag'] = self.beginTag()

Expand All @@ -71,23 +72,23 @@ def checkValues(self):
os.environ['DD_RELEASE'] = os.environ['CMSSW_VERSION']
#os.environ['DD_RELEASE'] = "CMSSW_9_3_0_pre3"

print '====='
print('=====')
if ( 'DD_SAMPLE_OUT' not in os.environ ) or ( os.environ['DD_SAMPLE_OUT'] == '' ):
os.environ['DD_SAMPLE_OUT'] = os.environ['DD_SAMPLE'].replace("RelVal", "ValFull")
print '====='
print('=====')

os.environ['DD_SOURCE'] = '/eos/cms/store/relval/' + os.environ['DD_RELEASE'] + '/' + os.environ['DD_SAMPLE'] + '/' + os.environ['DD_TIER'] + '/' + os.environ['DD_COND']
os.environ['outputFile'] = 'electronHistos.' + os.environ['DD_SAMPLE_OUT'] + '_gedGsfE.root'
if ( 'inputPostFile' not in os.environ ) or ( os.environ['inputPostFile'] == '' ):
os.environ['inputPostFile'] = os.environ['outputFile']

print 'DD_RELEASE', os.environ['DD_RELEASE']
print 'DD_SAMPLE', os.environ['DD_SAMPLE']
print 'DD_SAMPLE_OUT', os.environ['DD_SAMPLE_OUT']
print 'DD_COND', os.environ['DD_COND']
print 'DD_TIER', os.environ['DD_TIER']
print 'DD_SOURCE', os.environ['DD_SOURCE']
print 'outputFile :', os.environ['outputFile']
print 'inputPostFile :', os.environ['inputPostFile']
print 'beginTag : ', self.beginTag()
print('DD_RELEASE', os.environ['DD_RELEASE'])
print('DD_SAMPLE', os.environ['DD_SAMPLE'])
print('DD_SAMPLE_OUT', os.environ['DD_SAMPLE_OUT'])
print('DD_COND', os.environ['DD_COND'])
print('DD_TIER', os.environ['DD_TIER'])
print('DD_SOURCE', os.environ['DD_SOURCE'])
print('outputFile :', os.environ['outputFile'])
print('inputPostFile :', os.environ['inputPostFile'])
print('beginTag : ', self.beginTag())

3 changes: 2 additions & 1 deletion Validation/RecoEgamma/test/makeWebpage.py
Expand Up @@ -24,6 +24,7 @@
## index.html to an apropriate place.
## (This can be autmated too, if needed.)

from __future__ import print_function
import sys
import os
import re
Expand Down Expand Up @@ -52,7 +53,7 @@
# add all the plots in the directory
for i in range(len(list)):
if(re.search(r'gif',list[i])!=None):
print list[i]
print(list[i])
page.write('<a href=" '+list[i])
page.write('" onMouseOver="ThumbnailPlot(')
page.write("'"+list[i]+"'), ClearNotes(), ThumbnailNote() ")
Expand Down

0 comments on commit 5ea59bf

Please sign in to comment.