Merge pull request #52 from hatakeyamak/pfvalidation-10_6_X-master

Some readme improvements for on-the-fly running

Validation/RecoParticleFlow/README.md

@@ -23,6 +23,7 @@ voms-proxy-init -voms cms
 #RECO step, about 30 minutes
 #Necessary if you need to re-reco events to test introduced changes to PF reco.
 #Note that the default era & condition is now set to 2018. Change CONDITIONS and ERA in test/run_relval.sh when trying other era, before trying the above commands.
+#Also, you may run 'python datasets.py' to update filelists in tmp/das_cache after checking datasets specified in this python script
 make QCD_reco
 
 #DQM step, a few minutes

Validation/RecoParticleFlow/test/datasets.py

@@ -80,7 +80,8 @@ def get_das_cache_filename(self):
         Returns:
             TYPE: Description
         """
-        return os.path.join(self.tmpdir, "das_cache", self.process, self.escape_name() + ".txt")
+        return os.path.join(self.tmpdir, "das_cache", self.process + ".txt")
+        #return os.path.join(self.tmpdir, "das_cache", self.process + ".txt", self.escape_name() + ".txt")
 
     def get_filenames(self):
         """Summary
@@ -122,14 +123,16 @@ def cache_das_filenames(self):
 
 if __name__ == "__main__":
 
+    #prefix = ""
     prefix = "root://cmsxrootd.fnal.gov//"
     #prefix = "root://xrootd-cms.infn.it//"
     tmpdir = "tmp"
     datasets = [
-        Dataset("/RelValQCD_FlatPt_15_3000HS_13/CMSSW_10_4_0_pre4-103X_mc2017_realistic_v2-v1/GEN-SIM-DIGI-RAW", "QCD_FlatPt_noPU", prefix, None, False, tmpdir),
-        Dataset("/RelValQCD_FlatPt_15_3000HS_13/CMSSW_10_4_0_pre4-PU25ns_103X_mc2017_realistic_v2-v1/GEN-SIM-DIGI-RAW", "QCD_FlatPt_PU25ns", prefix, None, False, tmpdir),
-        Dataset("/RelValZMM_13/CMSSW_10_4_0_pre4-103X_mc2017_realistic_v2-v1/GEN-SIM-DIGI-RAW", "ZMM", prefix, None, False, tmpdir),
-        Dataset("/RelValMinBias_13/CMSSW_10_4_0_pre4-103X_mc2017_realistic_v2-v1/GEN-SIM-DIGI-RAW", "MinBias", prefix, None, False, tmpdir)
+        Dataset("/RelValQCD_FlatPt_15_3000HS_13/CMSSW_10_6_0-106X_upgrade2018_realistic_v4-v1/GEN-SIM-DIGI-RAW", "QCD_noPU", prefix, None, False, tmpdir),
+        Dataset("/RelValQCD_FlatPt_15_3000HS_13/CMSSW_10_6_0-PU25ns_106X_upgrade2018_realistic_v4-v1/GEN-SIM-DIGI-RAW", "QCD_PU", prefix, None, False, tmpdir),
+        Dataset("/RelValZMM_13/CMSSW_10_6_0-106X_upgrade2018_realistic_v4-v1/GEN-SIM-DIGI-RAW", "ZMM", prefix, None, False, tmpdir),
+        Dataset("/RelValMinBias_13/CMSSW_10_6_0-106X_upgrade2018_design_v3-v1/GEN-SIM-DIGI-RAW", "MinBias", prefix, None, False, tmpdir),
+        Dataset("/RelValNuGun/CMSSW_10_6_0-PU25ns_106X_upgrade2018_realistic_v4-v1/GEN-SIM-DIGI-RAW", "NuGun_PU", prefix, None, False, tmpdir)
     ]
 
     for ds in datasets: