Merge 80x series code into master to create new 94x branch point

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "Analyzer/python/wsuciutils"]
+	path = Analyzer/python/wsuciutils
+	url = [email protected]:jsturdy/wsu-ci-analysis-tools.git

Analyzer/plugins/BuildFile.xml

@@ -1,5 +1,9 @@
 <export>
 </export>
 <library   name="ZprimeDiLeptons_Analyzer_plugins" file="*.cc">
+  <flags CXXFLAGS="-O0 -g3 -fno-inline"/>
+  <flags CXX_FLAGS="-O0 -g3 -fno-inline"/>
+  <use   name="root"/>
+  <use   name="FWCore/ServiceRegistry"/>
   <use   name="ZprimeDiLeptons/Analyzer"/>
 </library>

Analyzer/test/ci_driver.py

@@ -0,0 +1,81 @@
+import os
+
+class ciDriver:
+
+    def __init__(self,*args,**kwargs):
+        from ci_2mu_samples import cito2musamples
+        from ci_2e_samples import cito2esamples
+        from dy_2mu_samples import dyto2musamples
+        from dy_2e_samples import dyto2esamples
+
+        print("args:",args)
+        print("kwargs",kwargs)
+
+        self.isDY = False
+        self.dy   = args[0]
+        self.lam  = None
+        self.intf = None
+        self.heli = None
+
+        if self.dy in ["DYTo2L"]:
+            self.isDY = True
+        else:
+            self.isDY = False
+            self.lam  = args[0]
+            self.intf = args[1]
+            self.heli = args[2]
+            pass
+
+        if self.lam in ["Lam10","Lam100k"]:
+            self.dbs  = "phys03"
+        else:
+            self.dbs  = "global"
+            pass
+
+        if self.isDY:
+            self.dyto2musamples = dyto2musamples["DY"]
+            self.dyto2esamples  = dyto2esamples["DY"]
+        else:
+            self.cito2musamples = cito2musamples[self.lam][self.intf][self.heli]
+            self.cito2esamples  = cito2esamples[self.lam][self.intf][self.heli]
+            pass
+        pass
+
+    def getJobOptions(self):
+        if self.isDY:
+            mcfiles = list(mu for mu in self.dyto2musamples) + list(e for e in self.dyto2esamples)
+        else:
+            mcfiles = list(mu for mu in self.cito2musamples) + list(e for e in self.cito2esamples)
+            pass
+
+        ci_job_options = {
+            "storageSite":"T3_US_FNALLPC",
+            "lfnBaseDir": "/store/user/%s/CINtuples_Dec15"%(os.getenv("USER")),
+            "cfgFile":    "runMakeZprimeMiniAodTreeMC_cfg.py",
+            "dbs":        self.dbs,
+            "datasets": {
+                "MC": mcfiles,
+                "data": [
+                    # ["/SingleMuon/Run2016B-23Sep2016-v3/MINIAOD",json],
+                    # ["/SingleMuon/Run2016C-23Sep2016-v1/MINIAOD",json],
+                    # ["/SingleMuon/Run2016D-23Sep2016-v1/MINIAOD",json],
+                    # ["/SingleMuon/Run2016E-23Sep2016-v1/MINIAOD",json],
+                    # ["/SingleMuon/Run2016F-23Sep2016-v1/MINIAOD",json],
+                    # ["/SingleMuon/Run2016G-23Sep2016-v1/MINIAOD",json],
+                    # ["/SingleMuon/Run2016H-PromptReco-v1/MINIAOD",json],
+                    # ["/SingleMuon/Run2016H-PromptReco-v2/MINIAOD",json],
+                    # ["/SingleMuon/Run2016H-PromptReco-v3/MINIAOD",json],
+                    # ["/SingleElectron/Run2016B-23Sep2016-v3/MINIAOD",json],
+                    # ["/SingleElectron/Run2016C-23Sep2016-v1/MINIAOD",json],
+                    # ["/SingleElectron/Run2016D-23Sep2016-v1/MINIAOD",json],
+                    # ["/SingleElectron/Run2016E-23Sep2016-v1/MINIAOD",json],
+                    # ["/SingleElectron/Run2016F-23Sep2016-v1/MINIAOD",json],
+                    # ["/SingleElectron/Run2016G-23Sep2016-v1/MINIAOD",json],
+                    # ["/SingleElectron/Run2016H-PromptReco-v1/MINIAOD",json],
+                    # ["/SingleElectron/Run2016H-PromptReco-v2/MINIAOD",json],
+                    # ["/SingleElectron/Run2016H-PromptReco-v3/MINIAOD",json],
+                    ],
+                },
+            }
+        return ci_job_options
+    pass

Analyzer/test/crabConfig_CI_ntupler.py

@@ -0,0 +1,32 @@
+from CRABClient.UserUtilities import config, getUsernameFromSiteDB
+config = config()
+
+## change as needed
+config.Data.inputDataset = '/CITo2Mu_M300_CUETP8M1_Lam22TeVConLL_13TeV_Pythia8_Corrected-v4/RunIISummer16MiniAODv2-PUMoriond17_80X_mcRun2_asymptotic_2016_TrancheIV_v6-v1/MINIAODSIM'
+sample = config.Data.inputDataset.split('/')
+
+## change as needed
+config.General.requestName = 'Dimuon_Ntuple_M300_CI_L22000_LL_Con_13TeV_test'
+config.General.workArea    = 'crab_projects'
+config.General.transferOutputs = True
+config.General.transferLogs    = True
+
+config.JobType.pluginName = 'Analysis'
+config.JobType.psetName = 'runMakeZprimeMiniAodTreeMC_cfg.py'
+#config.JobType.numCores = 4
+
+config.JobType.pyCfgParams = ['sampleType=%s'%(sample[1]), 'runCrab=True']
+#config.Data.outputPrimaryDataset = 'CIToEEntuple'
+config.Data.inputDBS    = 'global'
+config.Data.splitting   = 'FileBased'
+config.Data.unitsPerJob = 1
+## config.Data.totalUnits  = 1 ## only do one job for testing purposes
+#NJOBS = 100
+#config.Data.totalUnits = config.Data.unitsPerJob * NJOBS
+## change as needed
+config.Data.outLFNDirBase    = '/store/user/sturdy' #%s/' % (getUsernameFromSiteDB())
+config.Data.publication      = True
+config.Data.outputDatasetTag = 'ntuples'
+
+## change as needed
+config.Site.storageSite = 'T3_US_FNALLPC' 

Analyzer/test/dy_2e_samples.py

@@ -0,0 +1,6 @@
+dyto2esamples = {
+    "DY": [
+        ["/DYTo2E_M1300_CUETP8M1_13TeV_Pythia8_Corrected-v3/RunIISummer16MiniAODv2-PUMoriond17_80X_mcRun2_asymptotic_2016_TrancheIV_v6-v2/MINIAODSIM", None],
+        ["/DYTo2E_M800_CUETP8M1_13TeV_Pythia8_Corrected-v3/RunIISummer16MiniAODv2-PUMoriond17_80X_mcRun2_asymptotic_2016_TrancheIV_v6-v2/MINIAODSIM", None],
+        ],
+    }

Analyzer/test/dy_2mu_samples.py

@@ -0,0 +1,7 @@
+dyto2musamples = {
+    "DY": [
+        ["/DYTo2Mu_M1300_CUETP8M1_13TeV_Pythia8_Corrected-v3/RunIISummer16MiniAODv2-PUMoriond17_80X_mcRun2_asymptotic_2016_TrancheIV_v6-v1/MINIAODSIM", None],
+        ["/DYTo2Mu_M300_CUETP8M1_13TeV_Pythia8_Corrected-v3/RunIISummer16MiniAODv2-PUMoriond17_80X_mcRun2_asymptotic_2016_TrancheIV_v6-v1/MINIAODSIM", None],
+        ["/DYTo2Mu_M800_CUETP8M1_13TeV_Pythia8_Corrected-v3/RunIISummer16MiniAODv2-PUMoriond17_80X_mcRun2_asymptotic_2016_TrancheIV_v6-v1/MINIAODSIM", None],
+        ],
+    }

Analyzer/test/getSamples.sh

@@ -0,0 +1,123 @@
+# CI Samples
+lvals=( "1" "10" "16" "22" "28" "34" "100k" )
+intf=( "Con" "Des" )
+heli=( "LR" "LL" "RR" )
+
+cat <<EOF > ci_2mu_samples.py
+cito2musamples = {
+EOF
+
+cat <<EOF > ci_2e_samples.py
+cito2esamples = {
+EOF
+
+for l in "${lvals[@]}"
+do
+    cat <<EOF >> ci_2mu_samples.py
+    "Lam${l}": {
+EOF
+    cat <<EOF >> ci_2e_samples.py
+    "Lam${l}": {
+EOF
+    for i in "${intf[@]}"
+    do
+        cat <<EOF >> ci_2mu_samples.py
+        "${i}": {
+EOF
+        cat <<EOF >> ci_2e_samples.py
+        "${i}": {
+EOF
+        for h in "${heli[@]}"
+        do
+            cat <<EOF >> ci_2mu_samples.py
+            "${h}": [
+EOF
+            cat <<EOF >> ci_2e_samples.py
+            "${h}": [
+EOF
+            echo "ci_Lam${l}TeV${i}${h}.progress"
+            muquery="dataset dataset=/CITo2Mu*Lam${l}TeV${i}${h}*Corrected-v4/*/MINIAODSIM"
+            elquery="dataset dataset=/CITo2E*Lam${l}TeV${i}${h}*Corrected-v4/*/MINIAODSIM"
+            if [ "${l}" = "100k" ]
+            then
+                muquery="dataset dataset=/CIToMu*/pthapa-*MiniAod*_M*_L100K_${h}_${i}*/USER instance=prod/phys03"
+                elquery="dataset dataset=/CIToDie*/pdong-Dielectron_100*TeV_miniAOD_M*_${h}_${i}*/USER instance=prod/phys03"
+            elif [ "${l}" = "10" ]
+            then
+                :
+                muquery="dataset dataset=/CITo*/szaleski-MuMu_miniAODSIM_${h}${i}M*_Use-*/USER instance=prod/phys03"
+                elquery="dataset dataset=/CITo*Lam${l}/szaleski-EE_miniAODSIM*_${h}${i}M*_remade-*/USER instance=prod/phys03"
+            elif [ "${l}" = "1" ]
+            then
+                muquery="dataset dataset=/CITo2Mu*Lam16TeV${i}${h}*Corrected-v3/*/MINIAODSIM"
+                elquery="dataset dataset=/CITo2E*Lam16TeV${i}${h}*Corrected-v3/*/MINIAODSIM"
+            fi
+            echo "dasgoclient --query=\"${muquery}\"|egrep -v (test|Aug9)"
+            res=$(dasgoclient --query=${muquery}|egrep -v (test|Aug9))
+            echo "$res" 2>&1 |tee -a ci_2mu_samples.py
+            # dasgoclient --query=${muquery} 2>&1 |tee -a ci_2mu_samples.py
+            echo "dasgoclient --query=\"${elquery}\"|egrep -v (test|Aug9)"
+            res=$(dasgoclient --query=${elquery}|egrep -v (test|Aug9))
+            echo "$res" 2>&1 |tee -a ci_2e_samples.py
+            # dasgoclient --query=${elquery} 2>&1 |tee -a ci_2e_samples.py
+
+            cat <<EOF >> ci_2mu_samples.py
+            ],
+EOF
+            cat <<EOF >> ci_2e_samples.py
+            ],
+EOF
+        done
+        cat <<EOF >> ci_2mu_samples.py
+        },
+EOF
+        cat <<EOF >> ci_2e_samples.py
+        },
+EOF
+    done
+    cat <<EOF >> ci_2mu_samples.py
+    },
+EOF
+    cat <<EOF >> ci_2e_samples.py
+    },
+EOF
+done
+cat <<EOF >> ci_2mu_samples.py
+}
+EOF
+cat <<EOF >> ci_2e_samples.py
+}
+EOF
+
+# DY samples
+cat <<EOF > dy_2mu_samples.py
+dyto2musamples = {
+EOF
+
+cat <<EOF > dy_2e_samples.py
+dyto2esamples = {
+EOF
+
+echo "dy_Lam${l}TeV${i}${h}.progress"
+muquery="dataset dataset=/DYTo2Mu*Corrected-v3/*/MINIAODSIM"
+elquery="dataset dataset=/DYTo2E*Corrected-v3/*/MINIAODSIM"
+echo "dasgoclient --query=\"${muquery}\"|egrep -v (test|Aug9)"
+res=$(dasgoclient --query=${muquery}|egrep -v (test|Aug9))
+echo "$res" 2>&1 |tee -a dy_2mu_samples.py
+# dasgoclient --query=${muquery} 2>&1 |tee -a dy_2mu_samples.py
+echo "dasgoclient --query=\"${elquery}\"|egrep -v (test|Aug9)"
+res=$(dasgoclient --query=${elquery}|egrep -v (test|Aug9))
+echo "$res" 2>&1 |tee -a dy_2e_samples.py
+# dasgoclient --query=${elquery} 2>&1 |tee -a dy_2e_samples.py
+
+cat <<EOF >> dy_2mu_samples.py
+}
+EOF
+cat <<EOF >> dy_2e_samples.py
+}
+EOF
+
+perl -pi -e 's?/DYTo?["/DYTo?g'                    dy_2*_samples.py
+perl -pi -e 's?/CITo?["/CITo?g'                    ci_2*_samples.py
+perl -pi -e 's?/MINIAODSIM?/MINIAODSIM", None],?g' ??_2*_samples.py
+perl -pi -e 's?/USER?/USER", None],?g'             ??_2*_samples.py