Few commits to run at ifca T2 and (post)process fastsim datasets

NanoGardener/python/data/SusyISRCorrections.py

@@ -1,56 +1,61 @@
-
+ 
 SUSYISRCorrections = {
-
-    'njetISR' : { 'susyModels' : { 'T2tt' : '1', 
-                                   'T2bW' : '1',  
-                                   },
-                  'version' : { 'Ana'    : { 'production' : { 'Full2016'      : '1', 
-                                                              'Full2016v4'    : '1', 
-                                                              },                                          
-                                             'correction' : { '0' :  '1.000',
-                                                              '1' :  '0.920',
-                                                              '2' :  '0.821',
-                                                              '3' :  '0.715',
-                                                              '4' :  '0.662',
-                                                              '5' :  '0.561',
-                                                              '6' :  '0.511',
-                                                              },
-                                             },
-                                'Ashraf' : { 'production' : { 'Full2017v4'    : '1', 
-                                                              'Full2018v4'    : '1', 
-                                                              },
-                                             'correction' : { '0' :  '1.000',
-                                                              '1' :  '0.914',
-                                                              '2' :  '0.796',
-                                                              '3' :  '0.698',
-                                                              '4' :  '0.602',
-                                                              '5' :  '0.579',
-                                                              '6' :  '0.580',
-                                                              },
-                                             },
-                                },
-                  },
-
-    'ptISR'   : { 'susyModels' : { 'TChiWW'      : '1', 
-                                   'TChiSlepSnu' : '1', 
-                                   'TChiStauSnu' : '1',  
-                                   },
-                  'version' : { 'Ana'    : { 'production' : { 'Full2016'      : '1', 
-                                                              'Full2016v4'    : '1', 
-                                                              'Full2017v4'    : '1', 
-                                                              'Full2018v4'    : '1', 
-                                                              },
-                                             'correction' : {  '000' :  '1.000', 
-                                                               '050' :  '1.052', 
-                                                               '100' :  '1.179',  
-                                                               '150' :  '1.150',  
-                                                               '200' :  '1.057',  
-                                                               '300' :  '1.000',  
-                                                               '400' :  '0.912',  
-                                                               '600' :  '0.783', 
-                                                               },
-                                             }, 
-                                },
-                  },
+
+    'strong' : { 'susyPromptParticles' : [ '1000005', '1000006', '2000005', '2000006' ],
+                 'version' : { 'Ana2016Dec'    : { 'production' : [ 'Full2016v4', 'Full2016v6', 'Full2016v6', 'Full2016v7' ], 
+                                                   'observable' : 'njetISR',
+                                                   'correction' : { '0' :  '1.000',
+                                                                    '1' :  '0.920',
+                                                                    '2' :  '0.821',
+                                                                    '3' :  '0.715',
+                                                                    '4' :  '0.662',
+                                                                    '5' :  '0.561',
+                                                                    '6' :  '0.511',
+                                                                },
+                                               },
+                               'Ashraf2019Mar' : { 'production' : [ 'Full2017v4', 'Full2017v6', 'Full2017v7', 
+                                                                    'Full2018v4', 'Full2018v6', 'Full2018v7' ], 
+                                                   'observable' : 'njetISR',
+                                                   'correction' : { '0' :  '1.000',
+                                                                    '1' :  '0.914',
+                                                                    '2' :  '0.796',
+                                                                    '3' :  '0.698',
+                                                                    '4' :  '0.602',
+                                                                    '5' :  '0.579',
+                                                                    '6' :  '0.580',
+                                                                },
+                                               },
+                           },
+             },
 
+    'EWK'    : { 'susyPromptParticles' : [ '1000022', '1000023', '1000024', 
+                                           '1000011', '1000013', '1000015', 
+                                           '2000011', '2000013', '2000015' ],
+                 'version' : { 'Ana2017Feb'    : { 'production' : [ 'Full2016v4', 'Full2016v6', 'Full2016v7' ],  
+                                                   'observable' : 'ptISR',
+                                                   'correction' : {  '000' :  '1.000', 
+                                                                     '050' :  '1.052', 
+                                                                     '100' :  '1.179',  
+                                                                     '150' :  '1.150',  
+                                                                     '200' :  '1.057',  
+                                                                     '300' :  '1.000',  
+                                                                     '400' :  '0.912',  
+                                                                     '600' :  '0.783', 
+                                                                 },
+                                               },
+                               'Ashraf2020Feb' : { 'production' : [ 'Full2017v4', 'Full2017v6', 'Full2017v7', 
+                                                                    'Full2018v4', 'Full2018v6', 'Full2018v7' ], 
+                                                   'observable' : 'njetISR',
+                                                   'correction' : { '0' :  '1.010',
+                                                                    '1' :  '0.988',
+                                                                    '2' :  '1.000',
+                                                                    '3' :  '1.117',
+                                                                    '4' :  '1.379',
+                                                                    '5' :  '1.500',
+                                                                    '6' :  '2.262',
+                                                                },
+                                               }, 
+                           },
+             },
+
 }

NanoGardener/python/framework/PostProcMaker.py

@@ -473,8 +473,8 @@ def mkStageOut(self,prodFile,storeFile,cpMode=False):
         else:
           command = 'xrdcp -f '+self._Sites[self._LocalSite]['xrootdPath']+prodFile+' '+self._Sites[self._LocalSite]['xrootdPath']+storeFile
       # IFCA
-      elif self._LocalSite == 'ifca' :
-         if self._TargetSite == 'ifca' or self._TargetSite == None :
+      elif self._LocalSite == 'ifca' or self._LocalSite == 'cloud' :
+         if self._TargetSite == 'ifca' or self._TargetSite == 'cloud' or self._TargetSite == None :
             if self._redo :
                command += 'rm '+storeFile+' ; '
             if not cpMode:
@@ -732,6 +732,10 @@ def customizeModule(self,iSample,iStep):
      if 'RPLME_YEAR' in module :
        module = module.replace('RPLME_YEAR',self._prodYear)
 
+     # SOURCEDIR
+     if 'RPLME_SOURCEDIR' in module :
+       module = module.replace('RPLME_SOURCEDIR',self._sourceDir)
+
      # SAMPLE
      if 'RPLME_SAMPLE' in module :
        module = module.replace('RPLME_SAMPLE',iSample)
@@ -943,7 +947,9 @@ def mkHadd(self,iProd,iStep):
              self._crab.AddJobOutputFile(iStep,iTarget,outFile)
              self._crab.setUnpackCommands(iStep,iTarget,[outFile],[stageOutCmd])
 
-     if   self._jobMode == 'Batch' and not self._pretend : self._jobs.Sub()
+     if   self._jobMode == 'Batch' and not self._pretend : 
+	if self._LocalSite=='ifca' or self._LocalSite=='cloud': self._jobs.Sub(self._batchQueue)
+	else: self._jobs.Sub()	
      elif self._jobMode == 'Crab':
         self._crab.mkCrabCfg()
         if not self._pretend : self._crab.Sub()

NanoGardener/python/framework/Sites_cfg.py

@@ -42,6 +42,11 @@
               'xrootdPath'  : '' ,
               'srmPrefix'   : 'srm://srm01.ifca.es' ,
               'treeBaseDir' : '/gpfs/projects/tier3data/LatinosSkims/RunII/Nano/' ,
-             }
+              'batchQueues' : ['cms_main','cms_high','cms_med'],
+              'slc_ver'     : 7
+             },
 
 }
+
+Sites['cloud'] = Sites['ifca']
+

NanoGardener/python/framework/Steps_cfg.py

@@ -3190,7 +3190,7 @@ def prepare_CombJJLNu_syst(basename, selection):
                   'do4MC'      : True  ,
                   'do4Data'    : False ,
                   'import'     : 'LatinoAnalysis.NanoGardener.modules.SusyWeightsProducer' ,
-                  'module'     : 'SusyWeightsProducer("RPLME_CMSSW")' ,
+                  'module'     : 'SusyWeightsProducer("RPLME_CMSSW", "RPLME_SOURCEDIR")' ,
              },
 
 ## ------- MODULES: Embedding

NanoGardener/python/framework/samples/Autumn18FS_102X_nAODv4_v16.py

@@ -0,0 +1,27 @@
+
+Samples = {}
+
+
+#### T2tt
+
+Samples['T2tt__mStop-150to250']       = {'nanoAOD' : '/SMS-T2tt_mStop-150to250_TuneCP2_13TeV-madgraphMLM-pythia8/RunIIAutumn18NanoAODv4-PUFall18Fast_Nano14Dec2018_102X_upgrade2018_realistic_v16-v3/NANOAODSIM'}
+Samples['T2tt__mStop-250to350']       = {'nanoAOD' : '/SMS-T2tt_mStop-250to350_TuneCP2_13TeV-madgraphMLM-pythia8/RunIIAutumn18NanoAODv4-PUFall18Fast_Nano14Dec2018_102X_upgrade2018_realistic_v16-v3/NANOAODSIM'}
+Samples['T2tt__mStop-350to400']       = {'nanoAOD' : '/SMS-T2tt_mStop-350to400_TuneCP2_13TeV-madgraphMLM-pythia8/RunIIAutumn18NanoAODv4-PUFall18Fast_Nano14Dec2018_102X_upgrade2018_realistic_v16-v3/NANOAODSIM'}
+Samples['T2tt__mStop-400to1200']       = {'nanoAOD' : '/SMS-T2tt_mStop-400to1200_TuneCP2_13TeV-madgraphMLM-pythia8/RunIIAutumn18NanoAODv4-PUFall18Fast_Nano14Dec2018_102X_upgrade2018_realistic_v16-v2/NANOAODSIM'}
+#Samples['T2tt__mStop-1200to2000']      = {'nanoAOD' : '/SMS-T2tt_mStop-1200to2000_TuneCP2_13TeV-madgraphMLM-pythia8/RunIIAutumn18NanoAODv4-PUFall18Fast_Nano14Dec2018_102X_upgrade2018_realistic_v16-v2/NANOAODSIM'}
+
+#Samples['T2bW']                       = {'nanoAOD' : '/SMS-T2bW_TuneCP2_13TeV-madgraphMLM-pythia8/RunIIAutumn18NanoAODv4-PUFall18Fast_Nano14Dec2018_102X_upgrade2018_realistic_v16-v1/NANOAODSIM'}
+
+#### Chipm
+
+Samples['TChipmSlepSnu']              = {'nanoAOD' : ''}
+Samples['TChipmSlepSnu_mC1_825_1500'] = {'nanoAOD' : ''}
+Samples['TChipmWW']                   = {'srmPrefix': 'srm://srm01.ifca.es:8444/srm/managerv2?SFN=/cms', 'paths' : ['/store/group/phys_higgs/cmshww/amassiro/NanoProd/Autumn18FS_102X_nAODv4_GTv16_Full2018v4/TChipmWW/']}
+
+
+
+
+
+
+
+

NanoGardener/python/framework/samples/Autumn18FS_102X_nAODv6.py

@@ -0,0 +1,30 @@
+
+Samples = {}
+
+
+#### T2tt
+
+Samples['T2tt__mStop-150to250']       = {'srmPrefix': 'srm://srm01.ifca.es:8444/srm/managerv2?SFN=/cms', 'paths' : ['/store/group/phys_higgs/cmshww/amassiro/NanoProd/Autumn18FS_102X_nAODv6/T2tt__mStop-150to250/']}
+Samples['T2tt__mStop-250to350']       = {'srmPrefix': 'srm://srm01.ifca.es:8444/srm/managerv2?SFN=/cms', 'paths' : ['/store/group/phys_higgs/cmshww/amassiro/NanoProd/Autumn18FS_102X_nAODv6/T2tt__mStop-250to350/']}
+Samples['T2tt__mStop-350to400']       = {'srmPrefix': 'srm://srm01.ifca.es:8444/srm/managerv2?SFN=/cms', 'paths' : ['/store/group/phys_higgs/cmshww/amassiro/NanoProd/Autumn18FS_102X_nAODv6/T2tt__mStop-350to400/']}
+Samples['T2tt__mStop-400to1200']      = {'srmPrefix': 'srm://srm01.ifca.es:8444/srm/managerv2?SFN=/cms', 'paths' : ['/store/group/phys_higgs/cmshww/amassiro/NanoProd/Autumn18FS_102X_nAODv6/T2tt__mStop-400to1200/']}
+Samples['T2tt__mStop-1200to2000']     = {'srmPrefix': 'srm://srm01.ifca.es:8444/srm/managerv2?SFN=/cms', 'paths' : ['/store/group/phys_higgs/cmshww/amassiro/NanoProd/Autumn18FS_102X_nAODv6/T2tt__mStop-1200to2000/']}
+
+#### T2bW
+
+Samples['T2bW']                       = {'srmPrefix': 'srm://srm01.ifca.es:8444/srm/managerv2?SFN=/cms', 'paths' : ['/store/group/phys_higgs/cmshww/amassiro/NanoProd/Autumn18FS_102X_nAODv6/T2bW/']}
+
+#### TChipm
+
+Samples['TChipmSlepSnu']              = {'srmPrefix': 'srm://srm01.ifca.es:8444/srm/managerv2?SFN=/cms', 'paths' : ['/store/group/phys_higgs/cmshww/amassiro/NanoProd/Autumn18FS_102X_nAODv6/TChipmSlepSnu/']}
+Samples['TChipmSlepSnu_mC1_825_1500'] = {'srmPrefix': 'srm://srm01.ifca.es:8444/srm/managerv2?SFN=/cms', 'paths' : ['/store/group/phys_higgs/cmshww/amassiro/NanoProd/Autumn18FS_102X_nAODv6/TChipmSlepSnu_mC1_825_1500/']}
+
+#### TChipmWW
+
+Samples['TChipmWW']                   = {'srmPrefix': 'srm://srm01.ifca.es:8444/srm/managerv2?SFN=/cms', 'paths' : ['/store/group/phys_higgs/cmshww/amassiro/NanoProd/Autumn18FS_102X_nAODv6/TChipmWW/']}
+
+#### TSlepSlep
+
+Samples['TSlepSlep']                  = {'srmPrefix': 'srm://srm01.ifca.es:8444/srm/managerv2?SFN=/cms', 'paths' : ['/store/group/phys_higgs/cmshww/amassiro/NanoProd/Autumn18FS_102X_nAODv6/TSlepSlep/']}
+Samples['TSlepSlep_mSlep-500to1300']  = {'srmPrefix': 'srm://srm01.ifca.es:8444/srm/managerv2?SFN=/cms', 'paths' : ['/store/group/phys_higgs/cmshww/amassiro/NanoProd/Autumn18FS_102X_nAODv6/TSlepSlep_mSlep-500to1300/']}
+

NanoGardener/python/framework/samples/Summer16FS_102X_nAODv4.py

@@ -0,0 +1,25 @@
+
+Samples = {}
+
+
+#### T2tt
+
+Samples['T2tt__mStop-150to250']       = {'nanoAOD' : ''}
+Samples['T2tt__mStop-250to350']       = {'nanoAOD' : ''}
+Samples['T2tt__mStop-350to400']       = {'nanoAOD' : 'user'}
+Samples['T2tt__mStop-400to1200']       = {'nanoAOD' : '/SMS-T2tt_mStop-400to1200_TuneCUETP8M1_13TeV-madgraphMLM-pythia8/RunIISummer16NanoAODv4-PUSummer16v3Fast_Nano14Dec2018_102X_mcRun2_asymptotic_v6-v1/NANOAODSIM'}
+Samples['T2tt__mStop-1200to2000']      = {'nanoAOD' : '/SMS-T2tt_mStop-1200to2000_TuneCUETP8M1_13TeV-madgraphMLM-pythia8/RunIISummer16NanoAODv4-PUSummer16v3Fast_Nano14Dec2018_102X_mcRun2_asymptotic_v6-v1/NANOAODSIM'}
+
+Samples['T2bW']                       = {'nanoAOD' : '/SMS-T2bW_TuneCUETP8M1_13TeV-madgraphMLM-pythia8/RunIISummer16NanoAODv4-PUSummer16v3Fast_Nano14Dec2018_102X_mcRun2_asymptotic_v6-v1/NANOAODSIM'}
+
+#### Chipm
+
+
+
+Samples['TChipmSlepSnu']              = {'nanoAOD' : 'user'}
+Samples['TChipmSlepSnu_mC1_825_1500'] = {'srmPrefix': 'srm://srm01.ifca.es:8444/srm/managerv2?SFN=/cms', 'paths' : ['/store/group/phys_higgs/cmshww/amassiro/NanoProd/Summer16FS_102X_nAODv4_Full2016v4/TChipmSlepSnu_mC1_825_1500/']}
+Samples['TChipmWW']                   = {'srmPrefix': 'srm://srm01.ifca.es:8444/srm/managerv2?SFN=/cms', 'paths' : ['/store/group/phys_higgs/cmshww/amassiro/NanoProd/Summer16FS_102X_nAODv4_Full2016v4/TChipmWW/']}
+
+
+
+

NanoGardener/python/framework/samples/Summer16FS_102X_nAODv6.py

@@ -0,0 +1,30 @@
+
+Samples = {}
+
+
+#### T2tt
+
+Samples['T2tt__mStop-150to250']       = {'srmPrefix': 'srm://srm01.ifca.es:8444/srm/managerv2?SFN=/cms', 'paths' : ['/store/group/phys_higgs/cmshww/amassiro/NanoProd/Summer16FS_102X_nAODv6/T2tt__mStop-150to250/']}
+Samples['T2tt__mStop-250to350']       = {'srmPrefix': 'srm://srm01.ifca.es:8444/srm/managerv2?SFN=/cms', 'paths' : ['/store/group/phys_higgs/cmshww/amassiro/NanoProd/Summer16FS_102X_nAODv6/T2tt__mStop-250to350/']}
+Samples['T2tt__mStop-350to400']       = {'srmPrefix': 'srm://srm01.ifca.es:8444/srm/managerv2?SFN=/cms', 'paths' : ['/store/group/phys_higgs/cmshww/amassiro/NanoProd/Summer16FS_102X_nAODv6/T2tt__mStop-350to400/']}
+Samples['T2tt__mStop-400to1200']      = {'srmPrefix': 'srm://srm01.ifca.es:8444/srm/managerv2?SFN=/cms', 'paths' : ['/store/group/phys_higgs/cmshww/amassiro/NanoProd/Summer16FS_102X_nAODv6/T2tt__mStop-400to1200/']}
+Samples['T2tt__mStop-1200to2000']     = {'srmPrefix': 'srm://srm01.ifca.es:8444/srm/managerv2?SFN=/cms', 'paths' : ['/store/group/phys_higgs/cmshww/amassiro/NanoProd/Summer16FS_102X_nAODv6/T2tt__mStop-1200to2000/']}
+
+#### T2bW
+
+Samples['T2bW']                       = {'srmPrefix': 'srm://srm01.ifca.es:8444/srm/managerv2?SFN=/cms', 'paths' : ['/store/group/phys_higgs/cmshww/amassiro/NanoProd/Summer16FS_102X_nAODv6/T2bW/']}
+
+#### TChipm
+
+Samples['TChipmSlepSnu']              = {'srmPrefix': 'srm://srm01.ifca.es:8444/srm/managerv2?SFN=/cms', 'paths' : ['/store/group/phys_higgs/cmshww/amassiro/NanoProd/Summer16FS_102X_nAODv6/TChipmSlepSnu/']}
+Samples['TChipmSlepSnu_mC1_825_1500'] = {'srmPrefix': 'srm://srm01.ifca.es:8444/srm/managerv2?SFN=/cms', 'paths' : ['/store/group/phys_higgs/cmshww/amassiro/NanoProd/Summer16FS_102X_nAODv6/TChipmSlepSnu_mC1_825_1500/']}
+
+#### TChipmWW
+
+Samples['TChipmWW']                   = {'srmPrefix': 'srm://srm01.ifca.es:8444/srm/managerv2?SFN=/cms', 'paths' : ['/store/group/phys_higgs/cmshww/amassiro/NanoProd/Summer16FS_102X_nAODv6/TChipmWW/']}
+
+#### TSlepSlep
+
+Samples['TSlepSlep']                  = {'srmPrefix': 'srm://srm01.ifca.es:8444/srm/managerv2?SFN=/cms', 'paths' : ['/store/group/phys_higgs/cmshww/amassiro/NanoProd/Summer16FS_102X_nAODv6/TSlepSlep/']}
+Samples['TSlepSlep_mSlep-500to1300']  = {'srmPrefix': 'srm://srm01.ifca.es:8444/srm/managerv2?SFN=/cms', 'paths' : ['/store/group/phys_higgs/cmshww/amassiro/NanoProd/Summer16FS_102X_nAODv6/TSlepSlep_mSlep-500to1300/']}
+

NanoGardener/python/framework/samples/fall17FS_102X_nAODv4.py

@@ -0,0 +1,23 @@
+
+Samples = {}
+
+
+#### T2tt
+
+Samples['T2tt__mStop-150to250']       = {'nanoAOD' : ''}
+Samples['T2tt__mStop-250to350']       = {'nanoAOD' : '/SMS-T2tt_mStop-250to350_TuneCP2_13TeV-madgraphMLM-pythia8/RunIIFall17NanoAODv4-PUFall17Fast_Nano14Dec2018_102X_mc2017_realistic_v6_ext1-v1/NANOAODSIM'}
+Samples['T2tt__mStop-350to400']       = {'nanoAOD' : '/SMS-T2tt_mStop-350to400_TuneCP2_13TeV-madgraphMLM-pythia8/RunIIFall17NanoAODv4-PUFall17Fast_Nano14Dec2018_102X_mc2017_realistic_v6_ext1-v1/NANOAODSIM'}
+Samples['T2tt__mStop-400to1200']       = {'nanoAOD' : '/SMS-T2tt_mStop-400to1200_TuneCP2_13TeV-madgraphMLM-pythia8/RunIIFall17NanoAODv4-PUFall17Fast_Nano14Dec2018_102X_mc2017_realistic_v6_ext1-v1/NANOAODSIM'}
+#Samples['T2tt__mStop-1200to2000']      = {'nanoAOD' : '/SMS-T2tt_mStop-1200to2000_TuneCP2_13TeV-madgraphMLM-pythia8/RunIIFall17NanoAODv4-PUFall17Fast_Nano14Dec2018_102X_mc2017_realistic_v6_ext1-v1/NANOAODSIM'}
+
+#Samples['T2bW']                       = {'nanoAOD' : '/SMS-T2bW_TuneCP2_13TeV-madgraphMLM-pythia8/RunIIFall17NanoAODv4-PUFall17Fast_Nano14Dec2018_102X_mc2017_realistic_v6-v1/NANOAODSIM'}
+
+#### Chipm
+
+Samples['TChipmSlepSnu']              = {'nanoAOD' : '/SMS-TChipmSlepSnu_TuneCP2_13TeV-madgraphMLM-pythia8/RunIIFall17NanoAODv4-PUFall17Fast_Nano14Dec2018_102X_mc2017_realistic_v6-v1/NANOAODSIM'}
+Samples['TChipmSlepSnu_mC1_825_1500'] = {'nanoAOD' : '/SMS-TChipmSlepSnu_mC1_825_1500_TuneCP2_13TeV-madgraphMLM-pythia8/RunIIFall17NanoAODv4-PUFall17Fast_Nano14Dec2018_102X_mc2017_realistic_v6-v1/NANOAODSIM'}
+Samples['TChipmWW']                   = {'srmPrefix': 'srm://srm01.ifca.es:8444/srm/managerv2?SFN=/cms', 'paths' : ['/store/group/phys_higgs/cmshww/amassiro/NanoProd/Fall17FS_102X_nAODv4_Full2017v4/TChipmWW/']}
+
+
+
+