code development for dq eff direct

Author: ypwangg

PWGDQ/Core/CutsLibrary.cxx

@@ -3660,6 +3660,11 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName)
     return cut;
   }
 
+  if (!nameStr.compare("pairX3872Minitree")) {
+    cut->AddCut(GetAnalysisCut("pairX3872_minitree"));
+    return cut;
+  }
+
   if (nameStr == "DipionPairCut1") {
     cut->AddCut(GetAnalysisCut("DipionMassCut1"));
     return cut;
@@ -7124,6 +7129,19 @@ AnalysisCut* o2::aod::dqcuts::GetAnalysisCut(const char* cutName)
     return cut;
   }
 
+  TF1* fDeltaR2High = new TF1("fDeltaR2High", "[0]+[1]*x", 0.0, 5.0);
+  fDeltaR2High->SetParameters(3.0, -0.4);
+  if (!nameStr.compare("pairX3872_minitree")) {
+    cut->AddCut(VarManager::kRap, -0.8, 0.8);
+    cut->AddCut(VarManager::kQuadDefaultDileptonMass, 3.0, 5.0);
+    cut->AddCut(VarManager::kDeltaR2, 0.0, 1.0, false, VarManager::kPt, 5.0, 1000.0);
+    cut->AddCut(VarManager::kDeltaR2, 0.0, fDeltaR2High, false, VarManager::kPt, 0.0, 5.0);
+    cut->AddCut(VarManager::kQuadPt, 0.0, 1000.0);
+    cut->AddCut(VarManager::kVertexingProcCode, 0.5, 2.5);
+    cut->AddCut(VarManager::kVertexingQuadProcCode, 0.5, 2.5);
+    return cut;
+  }
+
   if (nameStr == "pairPtLow1") {
     cut->AddCut(VarManager::kPt, 2.0, 1000.0);
     return cut;

PWGDQ/Tasks/dqEfficiency_withAssoc_direct.cxx

@@ -3281,14 +3281,12 @@ struct AnalysisDileptonTrackTrack {
     if (!o2::base::GeometryManager::isGeometryLoaded()) {
       fCCDB->get<TGeoManager>(fConfigCCDBOptions.fConfigGeoPath);
     }
-    LOG(info) << "fCCDB inited";
 
     fValuesQuadruplet = new float[VarManager::kNVars];
     VarManager::SetDefaultVarNames();
     fHistMan = new HistogramManager("analysisHistos", "aa", VarManager::kNVars);
     fHistMan->SetUseDefaultVariableNames(true);
     fHistMan->SetDefaultVarNames(VarManager::fgVariableNames, VarManager::fgVariableUnits);
-    LOG(info) << "varnames set";
 
     TString sigNamesStr = fConfigMCRecSignals.value;
     std::unique_ptr<TObjArray> objRecSigArray(sigNamesStr.Tokenize(","));
@@ -3305,7 +3303,6 @@ struct AnalysisDileptonTrackTrack {
         }
       }
     }
-    LOG(info) << "recsignal inited";
 
     TString sigGenNamesStr = fConfigMCGenSignals.value;
     std::unique_ptr<TObjArray> objGenSigArray(sigGenNamesStr.Tokenize(","));
@@ -3317,7 +3314,6 @@ struct AnalysisDileptonTrackTrack {
         }
       }
     }
-    LOG(info) << "gensignal inited";
 
     string cfgTrackSelection_TrackCuts;
     getTaskOptionValue<string>(context, "analysis-track-selection", "cfgTrackCuts", cfgTrackSelection_TrackCuts, false);
@@ -3839,6 +3835,10 @@ void DefineHistograms(HistogramManager* histMan, const TString& histClasses, con
     //   dqhistograms::DefineHistograms(histMan, objArray->At(iclass)->GetName(), "mctruth_track");
     // }
 
+    if (classStr.Contains("MCTruthGenQuad")) {
+      dqhistograms::DefineHistograms(histMan, objArray->At(iclass)->GetName(), "mctruth_quad", histName);
+    }
+
     if (classStr.Contains("DileptonsSelected")) {
       dqhistograms::DefineHistograms(histMan, objArray->At(iclass)->GetName(), "pair", histName);
     }
@@ -3862,5 +3862,9 @@ void DefineHistograms(HistogramManager* histMan, const TString& histClasses, con
     if (classStr.Contains("DileptonHadronCorrelation")) {
       dqhistograms::DefineHistograms(histMan, objArray->At(iclass)->GetName(), "dilepton-hadron-correlation");
     }
+
+    if (classStr.Contains("Quadruplet")) {
+      dqhistograms::DefineHistograms(histMan, objArray->At(iclass)->GetName(), "dilepton-dihadron", histName);
+    }
   } // end loop over histogram classes
 }