Skip to content

Commit

Permalink
New analysis tag v5-02-10-AN
Browse files Browse the repository at this point in the history
  • Loading branch information
morsch committed Nov 15, 2011
2 parents 984528b + e85d233 commit 68296f7
Show file tree
Hide file tree
Showing 8 changed files with 58 additions and 47 deletions.
4 changes: 3 additions & 1 deletion ANALYSIS/AliPhysicsSelection.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -394,8 +394,10 @@ Bool_t AliPhysicsSelection::EvaluateTriggerLogic(const AliESDEvent* aEsd, AliTri
// if(fHistStatisticsTokens)
}
}

TFormula formula("formula", trigger);
if (formula.Compile() > 0)
AliFatal(Form("Could not evaluate trigger logic %s (evaluated to %s)", triggerLogic, trigger.Data()));
Bool_t result = formula.Eval(0);

AliDebug(AliLog::kDebug, Form("%s --> %d", trigger.Data(), result));
Expand Down
20 changes: 13 additions & 7 deletions ANALYSIS/EventMixing/AliMixEventCutObj.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,14 @@
#include "AliESDEvent.h"
#include "AliAODEvent.h"
#include "AliMultiplicity.h"
#include "AliAODVertex.h"

#include "AliMixEventCutObj.h"

ClassImp(AliMixEventCutObj)

//_________________________________________________________________________________________________
AliMixEventCutObj::AliMixEventCutObj(AliMixEventCutObj::EEPAxis_t type, Float_t min, Float_t max, Float_t step, const char* opt) : TObject(),
AliMixEventCutObj::AliMixEventCutObj(AliMixEventCutObj::EEPAxis_t type, Float_t min, Float_t max, Float_t step, const char *opt) : TObject(),
fCutType((Int_t)type),
fCutOpt(opt),
fCutMin(min),
Expand Down Expand Up @@ -53,7 +54,7 @@ AliMixEventCutObj::AliMixEventCutObj(const AliMixEventCutObj &obj) : TObject(obj
}

//_________________________________________________________________________________________________
AliMixEventCutObj& AliMixEventCutObj::operator=(const AliMixEventCutObj& obj)
AliMixEventCutObj &AliMixEventCutObj::operator=(const AliMixEventCutObj &obj)
{
//
// Assigned operator
Expand Down Expand Up @@ -155,7 +156,7 @@ Int_t AliMixEventCutObj::GetIndex(AliVEvent *ev)
}

//_________________________________________________________________________________________________
Double_t AliMixEventCutObj::GetValue(AliVEvent* ev)
Double_t AliMixEventCutObj::GetValue(AliVEvent *ev)
{
//
// Returns value from event
Expand All @@ -171,7 +172,7 @@ Double_t AliMixEventCutObj::GetValue(AliVEvent* ev)
}

//_________________________________________________________________________________________________
Double_t AliMixEventCutObj::GetValue(AliESDEvent* ev)
Double_t AliMixEventCutObj::GetValue(AliESDEvent *ev)
{
//
// Returns value from esd event
Expand Down Expand Up @@ -205,24 +206,29 @@ Double_t AliMixEventCutObj::GetValue(AliESDEvent* ev)
}

//_________________________________________________________________________________________________
Double_t AliMixEventCutObj::GetValue(AliAODEvent* ev)
Double_t AliMixEventCutObj::GetValue(AliAODEvent *ev)
{
//
// Returns value from aod event
//

AliAODVertex *v=0;
switch (fCutType) {
case kMultiplicity:
return (Double_t) ev->GetNumberOfTracks();
case kZVertex:
v = ev->GetVertex(0);
if (!v) return -99999;
return ev->GetVertex(0)->GetZ();
// if verttex is null return -9999
return -99999;
case kNumberV0s:
return ev->GetNumberOfV0s();
case kCentrality:
AliCentrality *c = ev->GetCentrality();
if (!c) AliFatal("aod->GetCentrality() is null");
if (fCutOpt.IsNull()) AliFatal("fCutOpt is null");
return c->GetCentralityPercentile(fCutOpt.Data());

}

AliFatal("Mixing Cut TYPE is not supported for AOD");
Expand Down Expand Up @@ -262,7 +268,7 @@ void AliMixEventCutObj::SetCurrentValueToIndex(Int_t index)
}

//_________________________________________________________________________________________________
void AliMixEventCutObj::PrintValues(AliVEvent* main, AliVEvent* mix)
void AliMixEventCutObj::PrintValues(AliVEvent *main, AliVEvent *mix)
{
//
// Prints values of both events for current type
Expand Down
4 changes: 2 additions & 2 deletions ANALYSIS/EventMixing/AliMixInfo.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -317,12 +317,12 @@ void AliMixInfo::DynamicExec(AliMixInfo *const mixInfo)
Double_t numMix = hMix->GetBinContent(binX);
Int_t hist2DValue = (Int_t) hSelected->GetBinContent(binX + 1, 1);

Int_t mixNum = 1;
// Int_t mixNum = 1;
if (text) {
if (mixInfo) {
AliMixEventPool *evPool = (AliMixEventPool *) mixInfo->GetEventPool("mixEventPool");
if (evPool) {
mixNum = evPool->GetMixNumber();
// mixNum = evPool->GetMixNumber();
if (binX - 1 >= 0) {
if (!evPool->SetCutValuesFromBinIndex(binX - 1)) return;
}
Expand Down
34 changes: 19 additions & 15 deletions ANALYSIS/EventMixing/AliMixInputEventHandler.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -128,8 +128,13 @@ Bool_t AliMixInputEventHandler::Notify(const char *path)
// Notify(const char*path) is called for all mix input handlers
//
AliDebug(AliLog::kDebug + 5, Form("<- %s", path));

Bool_t firstRun=(fMixIntupHandlerInfoTmp->GetChain()->GetEntries()<=0);

Bool_t doPrepareEntry=kTRUE;
TString anType = fAnalysisType;

// in case of local doPrepareEntry only first time
if (anType.CompareTo("proof")) doPrepareEntry = (fMixIntupHandlerInfoTmp->GetChain()->GetEntries()<=0);

// adds current file
fMixIntupHandlerInfoTmp->AddTreeToChain(path);
Int_t lastIndex = fMixIntupHandlerInfoTmp->GetChain()->GetListOfFiles()->GetEntries();
Expand All @@ -138,7 +143,8 @@ Bool_t AliMixInputEventHandler::Notify(const char *path)
for (Int_t i = 0; i < fInputHandlers.GetEntries(); i++) {
AliDebug(AliLog::kDebug + 5, Form("fInputHandlers[%d]", i));
mixIHI = new AliMixInputHandlerInfo(fMixIntupHandlerInfoTmp->GetName(), fMixIntupHandlerInfoTmp->GetTitle());
if (firstRun) mixIHI->PrepareEntry(che, -1, (AliInputEventHandler*)InputEventHandler(i), fAnalysisType);
// mixIHI->PrepareEntry(che, -1, (AliInputEventHandler *)InputEventHandler(i), fAnalysisType);
if (doPrepareEntry) mixIHI->PrepareEntry(che, -1, (AliInputEventHandler *)InputEventHandler(i), fAnalysisType);
AliDebug(AliLog::kDebug + 5, Form("chain[%d]->GetEntries() = %lld", i, mixIHI->GetChain()->GetEntries()));
fMixTrees.Add(mixIHI);
}
Expand Down Expand Up @@ -239,9 +245,9 @@ Bool_t AliMixInputEventHandler::MixStd()
mihi = (AliMixInputHandlerInfo *) fMixTrees.At(0);
TChainElement *te = fMixIntupHandlerInfoTmp->GetEntryInTree(entryMix);
if (!te) {
AliError("te is null. this is error. tell to developer (#1)");
AliError("te is null. this is error. tell to developer (#1)");
} else {
mihi->PrepareEntry(te, entryMix, (AliInputEventHandler*)InputEventHandler(0), fAnalysisType);
mihi->PrepareEntry(te, entryMix, (AliInputEventHandler *)InputEventHandler(0), fAnalysisType);
// runs UserExecMix for all tasks
fNumberMixed++;
UserExecMixAllTasks(fEntryCounter, 1, fEntryCounter, entryMixReal, fNumberMixed);
Expand Down Expand Up @@ -331,10 +337,10 @@ Bool_t AliMixInputEventHandler::MixBuffer()
mihi = (AliMixInputHandlerInfo *) fMixTrees.At(counter);
TChainElement *te = fMixIntupHandlerInfoTmp->GetEntryInTree(entryMix);
if (!te) {
AliError("te is null. this is error. tell to developer (#1)");
AliError("te is null. this is error. tell to developer (#1)");
} else {
AliDebug(AliLog::kDebug + 3, Form("Preparing InputEventHandler(%d)", counter));
mihi->PrepareEntry(te, entryMix, (AliInputEventHandler*)InputEventHandler(counter), fAnalysisType);
mihi->PrepareEntry(te, entryMix, (AliInputEventHandler *)InputEventHandler(counter), fAnalysisType);
// runs UserExecMix for all tasks
UserExecMixAllTasks(fEntryCounter, idEntryList, fEntryCounter, entryMixReal, counter);
fNumberMixed++;
Expand Down Expand Up @@ -440,9 +446,9 @@ Bool_t AliMixInputEventHandler::MixEventsMoreTimesWithOneEvent()
entryMixReal = entryMix;
TChainElement *te = fMixIntupHandlerInfoTmp->GetEntryInTree(entryMix);
if (!te) {
AliError("te is null. this is error. tell to developer (#2)");
AliError("te is null. this is error. tell to developer (#2)");
} else {
mihi->PrepareEntry(te, entryMix, (AliInputEventHandler*)InputEventHandler(0), fAnalysisType);
mihi->PrepareEntry(te, entryMix, (AliInputEventHandler *)InputEventHandler(0), fAnalysisType);
// runs UserExecMix for all tasks
fNumberMixed++;
UserExecMixAllTasks(fEntryCounter, idEntryList, currentMainEntry, entryMixReal, fNumberMixed);
Expand Down Expand Up @@ -480,7 +486,7 @@ Bool_t AliMixInputEventHandler::FinishEvent()
}

//_____________________________________________________________________________
void AliMixInputEventHandler::AddInputEventHandler(AliVEventHandler*)
void AliMixInputEventHandler::AddInputEventHandler(AliVEventHandler *)
{
//
// AddInputEventHandler will not be used
Expand All @@ -498,15 +504,13 @@ void AliMixInputEventHandler::UserExecMixAllTasks(Long64_t entryCounter, Int_t i
AliAnalysisManager *mgr = AliAnalysisManager::GetAnalysisManager();
AliAnalysisTaskSE *mixTask = 0;
TObjArrayIter next(mgr->GetTasks());
while ((mixTask = (AliAnalysisTaskSE *) next())) {
if (dynamic_cast<AliAnalysisTaskSE *>(mixTask)) {
while ((mixTask = dynamic_cast<AliAnalysisTaskSE *>(next()))) {
AliDebug(AliLog::kDebug, Form("%s %lld %d [%lld,%lld] %d", mixTask->GetName(), entryCounter, numMixed, entryMainReal, entryMixReal, idEntryList));
fCurrentEntry = entryCounter;
fCurrentEntryMain = entryMainReal;
fCurrentEntryMix = entryMixReal;
fCurrentBinIndex = idEntryList;
if (entryMixReal >= 0) mixTask->UserExecMix("");
}
}
}

Expand All @@ -517,8 +521,8 @@ void AliMixInputEventHandler::SetMixNumber(const Int_t mixNum)
// Sets mix number
//
if (fMixNumber > 1 && fBufferSize > 1) {
AliWarning("Sleeping 10 sec to show Warning Message ...");
AliWarning("=========================================================================================");
AliWarning("Sleeping 10 sec to show Warning Message ...");
AliWarning("=========================================================================================");
AliWarning(Form("BufferSize(%d) higher > 1 and fMixNumber(%d) > 1, which is not supported", fBufferSize, mixNum));
AliWarning("");
AliWarning("\tBufferSize will be set to 1");
Expand Down
2 changes: 2 additions & 0 deletions ANALYSIS/PROOF-INF.EventMixing/SETUP.C
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
void SETUP()
{
// Load the ANALYSIS library

gSystem->SetDynamicPath(Form("%s:%s", gSystem->pwd(), gSystem->GetDynamicPath()));
gSystem->Load("libEventMixing");

// Set the include paths
Expand Down
38 changes: 17 additions & 21 deletions ANALYSIS/macros/BrowseAndFillPhysicsSelectionOADB.C
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,6 @@
#endif


//FIXME: defaults for 2.76 TeV

void BrowseAndFillPhysicsSelectionOADB(Bool_t fill = kFALSE) {

// Load stuff
Expand Down Expand Up @@ -67,7 +65,7 @@ void BrowseAndFillPhysicsSelectionOADB(Bool_t fill = kFALSE) {

// DefaultPP
AliOADBPhysicsSelection * oadbDefaultPP = new AliOADBPhysicsSelection("oadbDefaultPP");
oadbDefaultPP->AddCollisionTriggerClass ( AliVEvent::kINT7,"+CINT7-I-NOPF-ALLNOTRD","B",0);
oadbDefaultPP->AddCollisionTriggerClass ( AliVEvent::kINT7,"+CINT7-[I|B]-NOPF-ALLNOTRD","B",0);
oadbDefaultPP->AddBGTriggerClass ( AliVEvent::kINT7,"+CINT7-AC-NOPF-ALLNOTRD","AC",0);
oadbDefaultPP->AddBGTriggerClass ( AliVEvent::kINT7,"+CINT7-E-NOPF-ALLNOTRD","E",0);
oadbDefaultPP->SetHardwareTrigger ( 0,"V0A && V0C");
Expand Down Expand Up @@ -103,49 +101,48 @@ void BrowseAndFillPhysicsSelectionOADB(Bool_t fill = kFALSE) {
oadbDefaultPP->SetHardwareTrigger ( 5,"V0A && V0C");
oadbDefaultPP->SetOfflineTrigger ( 5,"(V0A && V0C) && !V0ABG && !V0CBG && !TPCLaserWarmUp");

oadbDefaultPP->AddCollisionTriggerClass ( AliVEvent::kPHI7,"+CPHI7-I-NOPF-ALLNOTRD","B", 6);
oadbDefaultPP->AddCollisionTriggerClass ( AliVEvent::kPHI7,"+CPHI7-B-NOPF-ALLNOTRD","B", 6);
oadbDefaultPP->AddCollisionTriggerClass ( AliVEvent::kPHI7,"+CPHI7-[I|B]-NOPF-ALLNOTRD","B", 6);
oadbDefaultPP->AddBGTriggerClass ( AliVEvent::kPHI7,"+CPHI7-AC-NOPF-ALLNOTRD","AC",6);
oadbDefaultPP->AddBGTriggerClass ( AliVEvent::kPHI7,"+CPHI7-E-NOPF-ALLNOTRD","E", 6);
oadbDefaultPP->SetHardwareTrigger ( 6,"V0A && V0C");
oadbDefaultPP->SetOfflineTrigger ( 6,"(V0A && V0C) && !V0ABG && !V0CBG && !TPCLaserWarmUp");

/*
// PENDING VALIDATION https://savannah.cern.ch/bugs/?86829
oadbDefaultPP->AddCollisionTriggerClass ( AliVEvent::kDG5,"+CDG5-I-NOPF-ALLNOTRD","B", 7);
oadbDefaultPP->AddBGTriggerClass ( AliVEvent::kDG5,"+CDG5-AC-NOPF-ALLNOTRD","AC",7);
oadbDefaultPP->AddBGTriggerClass ( AliVEvent::kDG5,"+CDG5-E-NOPF-ALLNOTRD","E", 7);
// TODO TOF condition needs to be implemented (Savannah bug #87064)
oadbDefaultPP->SetHardwareTrigger ( 7,"!V0A && !V0C && SPDGFOL1 >= 2");
oadbDefaultPP->SetOfflineTrigger ( 7,"!V0A && !V0C && !V0ABG && !V0CBG && && SPDGFOL1 >= 2 && !TPCLaserWarmUp");
*/
oadbDefaultPP->SetOfflineTrigger ( 7,"!V0A && !V0C && !V0ABG && !V0CBG && SPDGFOL1 >= 2 && !TPCLaserWarmUp");

oadbContPS->AddDefaultObject(oadbDefaultPP);

// DefaultPbPb
AliOADBPhysicsSelection * oadbDefaultPbPb = new AliOADBPhysicsSelection("oadbDefaultPbPb");

Int_t triggerCount = 0;
oadbDefaultPbPb->AddCollisionTriggerClass ( AliVEvent::kMB,"+CPBI1-B-NOPF-ALLNOTRD,CPBI2_B1-B-NOPF-ALLNOTRD,CPBI2_B1-B-PF-ALLNOTRD","B",triggerCount);
oadbDefaultPbPb->AddBGTriggerClass ( AliVEvent::kMB,"+CPBI1-AC-NOPF-ALLNOTRD,CPBI2_B1-AC-NOPF-ALLNOTRD","AC",triggerCount);
oadbDefaultPbPb->AddBGTriggerClass ( AliVEvent::kMB,"+CPBI1-E-NOPF-ALLNOTRD,CPBI2_B1-E-NOPF-ALLNOTRD","E",triggerCount);
oadbDefaultPbPb->AddCollisionTriggerClass ( AliVEvent::kMB,"+CPBI1-B-NOPF-ALLNOTRD,CPBI2_B1-B-[NOPF|PF]-ALLNOTRD","B",triggerCount);
oadbDefaultPbPb->AddBGTriggerClass ( AliVEvent::kMB,"+CPBI[1|2_B1]-AC-NOPF-ALLNOTRD","AC",triggerCount);
oadbDefaultPbPb->AddBGTriggerClass ( AliVEvent::kMB,"+CPBI[1|2_B1]-E-NOPF-ALLNOTRD","E",triggerCount);
oadbDefaultPbPb->SetHardwareTrigger ( triggerCount,"V0A && V0C");
oadbDefaultPbPb->SetOfflineTrigger ( triggerCount,"V0A && V0C && !V0ABG && !V0CBG && !TPCLaserWarmUp && ZDCTime");

triggerCount++;
// Bug in early running, CVHN_R2-B-NOPF-ALLNOTRD needed explicitly up to run 167814 (to be moved to custom object as soon as all other things are fine)
oadbDefaultPbPb->AddCollisionTriggerClass ( AliVEvent::kCentral,"+CVHN-B-NOPF-ALLNOTRD,CVHN_R2-B-NOPF-ALLNOTRD,CVHN-B-NOPF-CENTNOTRD,CVHN-B-PF-ALLNOTRD,CVHN-B-PF-CENTNOTRD","B",triggerCount);
oadbDefaultPbPb->AddBGTriggerClass ( AliVEvent::kCentral,"+CVHN-AC-NOPF-ALLNOTRD,CVHN-AC-NOPF-CENTNOTRD","AC",triggerCount);
oadbDefaultPbPb->AddBGTriggerClass ( AliVEvent::kCentral,"+CVHN-E-NOPF-ALLNOTRD,CVHN-E-NOPF-CENTNOTRD","E",triggerCount);
// oadbDefaultPbPb->AddCollisionTriggerClass ( AliVEvent::kCentral,"+CVHN-B-NOPF-ALLNOTRD,CVHN_R2-B-NOPF-ALLNOTRD,CVHN-B-NOPF-CENTNOTRD,CVHN-B-NOPF-CENTNOTRD,CVHN-B-PF-ALLNOTRD,CVHN-B-PF-CENTNOTRD","B",triggerCount);
oadbDefaultPbPb->AddCollisionTriggerClass ( AliVEvent::kCentral,"+CVHN[|_R2]-B-[NOPF|PF]-[ALL|CENT]NOTRD","B",triggerCount);
oadbDefaultPbPb->AddBGTriggerClass ( AliVEvent::kCentral,"+CVHN-AC-NOPF-[ALL|CENT]NOTRD","AC",triggerCount);
oadbDefaultPbPb->AddBGTriggerClass ( AliVEvent::kCentral,"+CVHN-E-NOPF-[ALL|CENT]NOTRD","E",triggerCount);
oadbDefaultPbPb->SetHardwareTrigger ( triggerCount,"V0A && V0C && Central");
oadbDefaultPbPb->SetOfflineTrigger ( triggerCount,"V0A && V0C && !V0ABG && !V0CBG && !TPCLaserWarmUp && ZDCTime");

triggerCount++;
// semicentral includes central ones (and might have different downscaling)
// Bug in early running, CVHN_R2-B-NOPF-ALLNOTRD,CVLN_B2-B-NOPF-ALLNOTRD needed explicitly up to run 167814 (to be moved to custom object as soon as all other things are fine)
oadbDefaultPbPb->AddCollisionTriggerClass ( AliVEvent::kSemiCentral,"+CVHN-B-NOPF-ALLNOTRD,CVHN_R2-B-NOPF-ALLNOTRD,CVHN-B-NOPF-CENTNOTRD,CVHN-B-PF-ALLNOTRD,CVHN-B-PF-CENTNOTRD,CVLN-B-NOPF-ALLNOTRD,CVLN_B2-B-NOPF-ALLNOTRD,CVLN-B-PF-ALLNOTRD","B",triggerCount);
oadbDefaultPbPb->AddBGTriggerClass ( AliVEvent::kSemiCentral,"+CVHN-AC-NOPF-ALLNOTRD,CVHN-AC-NOPF-CENTNOTRD,CVLN-AC-NOPF-ALLNOTRD","AC",triggerCount);
oadbDefaultPbPb->AddBGTriggerClass ( AliVEvent::kSemiCentral,"+CVHN-E-NOPF-ALLNOTRD,CVHN-E-NOPF-CENTNOTRD,CVLN-E-NOPF-ALLNOTRD","E",triggerCount);
// oadbDefaultPbPb->AddCollisionTriggerClass ( AliVEvent::kSemiCentral,"+CVHN-B-NOPF-ALLNOTRD,CVHN_R2-B-NOPF-ALLNOTRD,CVHN-B-NOPF-CENTNOTRD,CVHN-B-PF-ALLNOTRD,CVHN-B-PF-CENTNOTRD,CVLN-B-NOPF-ALLNOTRD,CVLN_B2-B-NOPF-ALLNOTRD,CVLN-B-PF-ALLNOTRD","B",triggerCount);
oadbDefaultPbPb->AddCollisionTriggerClass ( AliVEvent::kSemiCentral,"+CVHN[|_R2]-B-[NOPF|PF]-[ALL|CENT]NOTRD,CVLN[|_B2]-B-[NOPF|PF]-ALLNOTRD","B",triggerCount);

oadbDefaultPbPb->AddBGTriggerClass ( AliVEvent::kSemiCentral,"+CVHN-AC-NOPF-[ALL|CENT]NOTRD,CVLN-AC-NOPF-ALLNOTRD","AC",triggerCount);
oadbDefaultPbPb->AddBGTriggerClass ( AliVEvent::kSemiCentral,"+CVHN-E-NOPF-[ALL|CENT]NOTRD,CVLN-E-NOPF-ALLNOTRD","E",triggerCount);
oadbDefaultPbPb->SetHardwareTrigger ( triggerCount,"V0A && V0C && SemiCentral && !Central");
oadbDefaultPbPb->SetOfflineTrigger ( triggerCount,"V0A && V0C && !V0ABG && !V0CBG && !TPCLaserWarmUp && ZDCTime");

Expand Down Expand Up @@ -191,7 +188,7 @@ void BrowseAndFillPhysicsSelectionOADB(Bool_t fill = kFALSE) {

// Trigger analysis defaults
AliOADBTriggerAnalysis * oadbTrigAnalysis = new AliOADBTriggerAnalysis("Default");
oadbTrigAnalysis->SetZDCCorrParameters(0, 0, 4*0.6, 4*0.6);
oadbTrigAnalysis->SetZDCCorrParameters(0, 0, 4*0.7, 4*0.7);
oadbContTriggerAnalysis->AddDefaultObject(oadbTrigAnalysis);

// ----- 2009 - 2010 -----
Expand Down Expand Up @@ -938,8 +935,7 @@ void BrowseAndFillPhysicsSelectionOADB(Bool_t fill = kFALSE) {
oadbLHC11d1->SetHardwareTrigger ( 5,"V0A && V0C");
oadbLHC11d1->SetOfflineTrigger ( 5,"(V0A && V0C) && !V0ABG && !V0CBG && !TPCLaserWarmUp");

oadbLHC11d1->AddCollisionTriggerClass ( AliVEvent::kPHI7,"+CPHI7-B-NOPF-ALLNOTRD","B", 6);
oadbLHC11d1->AddCollisionTriggerClass ( AliVEvent::kPHI7,"+CPHI7-I-NOPF-ALLNOTRD","B", 6);
oadbLHC11d1->AddCollisionTriggerClass ( AliVEvent::kPHI7,"+CPHI7-B-NOPF-ALLNOTRD,CPHI7-I-NOPF-ALLNOTRD","B", 6);
oadbLHC11d1->AddBGTriggerClass ( AliVEvent::kPHI7,"+CPHI7-AC-NOPF-ALLNOTRD","AC",6);
oadbLHC11d1->AddBGTriggerClass ( AliVEvent::kPHI7,"+CPHI7-E-NOPF-ALLNOTRD","E", 6);
oadbLHC11d1->SetHardwareTrigger ( 6,"V0A && V0C");
Expand Down
2 changes: 1 addition & 1 deletion PWG1/PWG1LinkDef.h
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@
#pragma link C++ class AliTrackComparison+;
#pragma link C++ class AliTrackComparisonESD+;
#pragma link C++ class AliAnalysisTaskGlobalQA+;
//#pragma link C++ class AliGlobalFBFqa+;
#pragma link C++ class AliGlobalFBFqa+;


#endif
1 change: 1 addition & 0 deletions STEER/STEERBase/AliVEvent.h
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ class AliVEvent : public TObject {
kEMCEGA = BIT(15), // EMCAL gamma trigger
kCentral = BIT(16), // PbPb central collision trigger
kSemiCentral = BIT(17), // PbPb semicentral collision trigger
kDG5 = BIT(18), // Double gap diffractive
kUserDefined = BIT(27), // Set when custom trigger classes are set in AliPhysicsSelection, offline SPD or V0 selection
// Bits 28 and above are reserved for FLAGS
kFastOnly = BIT(30), // The fast cluster fired. This bit is set in to addition another trigger bit, e.g. kMB
Expand Down

0 comments on commit 68296f7

Please sign in to comment.