Merge branch 'test.PileupReweighting-20170620' into 'master'

PileupReweighting: Fix ATN test.

See merge request !2811
Former-commit-id: 1181cc3b

PhysicsAnalysis/AnalysisCommon/PileupReweighting/share/generatePRW_jobOptions.py

@@ -5,7 +5,9 @@ theApp.EvtMax=-1                                         #says how many events t
 import AthenaRootComps.ReadAthenaxAODHybrid
 svcMgr.EventSelector.AccessMode=1 #use class access mode ... I know it's wrong, but it should be ok just for the EventInfo information
 from glob import glob
-svcMgr.EventSelector.InputCollections=glob( vars().get("FILES",os.environ['ASG_TEST_FILE_MC']).strip() )
+defFile = os.environ.get ('ASG_TEST_FILE_MC',
+                          '/afs/cern.ch/user/a/asgbase/patspace/xAODs/r7725/mc15_13TeV.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.merge.AOD.e3698_s2608_s2183_r7725_r7676/AOD.07915862._000100.pool.root.1')
+svcMgr.EventSelector.InputCollections=glob( vars().get("FILES",defFile).strip() )
 
 if len(svcMgr.EventSelector.InputCollections)==0:
    print("WARNING  >>>>>>>>>>  generatePRW_jobOptions.py:   NO INPUT FILES PROVIDED/FOUND FROM: %s ... this will produce a failure unless you are sending this job to the grid <<<<<<<<<<<<" % vars().get("FILES","/afs/cern.ch/atlas/project/PAT/xAODs/r5591/mc14_8TeV.117050.PowhegPythia_P2011C_ttbar.recon.AOD.e1727_s1933_s1911_r5591/AOD.01494882._111853.pool.root.1").strip())