Skip to content

Commit

Permalink
Merge branch 'master' of https://git.cern.ch/reps/AliRoot
Browse files Browse the repository at this point in the history
  • Loading branch information
@mkrzewic
mkrzewic committed Oct 14, 2014
2 parents a52b7e3 + 08e4a6c commit 440ba47
Show file tree
Hide file tree
Showing 9 changed files with 223 additions and 160 deletions.
15 changes: 11 additions & 4 deletions EVE/EveBase/AliEveConfigManager.cxx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ AliEveConfigManager::AliEveConfigManager() :
fStoragePopup->AddEntry("&Mark event",kStorageMarkEvent);

gEve->GetBrowser()->StartEmbedding(0);
fListEventsTab = AliStorageAdministratorPanelListEvents::GetInstance();
AliStorageAdministratorPanelListEvents* fListEventsTab = AliStorageAdministratorPanelListEvents::GetInstance();
gEve->GetBrowser()->StopEmbedding("List");

fListEventsTab->Connect("SelectedEvent()","AliEveConfigManager",this,"SetEventInEventManager()");
Expand Down Expand Up @@ -1081,7 +1081,10 @@ void AliEveConfigManager::AliEvePopupHandler(Int_t id)

void AliEveConfigManager::SetEventInEventManager()
{
#ifdef ZMQ

AliEveEventManager *manager = AliEveEventManager::GetMaster();
AliStorageAdministratorPanelListEvents* fListEventsTab = AliStorageAdministratorPanelListEvents::GetInstance();
AliESDEvent *event = fListEventsTab->GetSelectedEvent();

if(event)
Expand All @@ -1091,27 +1094,31 @@ void AliEveConfigManager::SetEventInEventManager()
manager->SetAutoLoad(kFALSE);
manager->PrepareForNewEvent(event);
}
#endif
}

void AliEveConfigManager::StorageManagerChangedState(int state)
{
#ifdef ZMQ

AliEveEventManager *manager = AliEveEventManager::GetMaster();
AliStorageAdministratorPanelListEvents* listEventsTab = AliStorageAdministratorPanelListEvents::GetInstance();
AliStorageAdministratorPanelListEvents* fListEventsTab = AliStorageAdministratorPanelListEvents::GetInstance();

if (manager->IsOnlineMode()) {
if (state == 0)// storage manager is down
{
fStoragePopup->DisableEntry(kStorageMarkEvent);
listEventsTab->SetOfflineMode(kTRUE);
fListEventsTab->SetOfflineMode(kTRUE);

}
else if(state == 1)// storage manager is alive
{
fStoragePopup->EnableEntry(kStorageMarkEvent);
listEventsTab->SetOfflineMode(kFALSE);
fListEventsTab->SetOfflineMode(kFALSE);

}
}
#endif
}

void AliEveConfigManager::DisableStoragePopup(){
Expand Down
5 changes: 0 additions & 5 deletions EVE/EveBase/AliEveConfigManager.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
#define AliEveConfigManager_H

#include "TObject.h"
#include "AliStorageAdministratorPanelListEvents.h"

class TGPopupMenu;

Expand Down Expand Up @@ -53,10 +52,6 @@ class AliEveConfigManager : public TObject
private:
AliEveConfigManager();

AliStorageAdministratorPanelListEvents *fListEventsWindow;
AliStorageAdministratorPanelListEvents *fListEventsTab;


AliEveConfigManager(const AliEveConfigManager&); // Not implemented
AliEveConfigManager& operator=(const AliEveConfigManager&); // Not implemented

Expand Down
13 changes: 10 additions & 3 deletions EVE/EveBase/AliEveEventManagerEditor.cxx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -306,14 +306,17 @@ void AliEveEventManagerWindow::DoSetTrigSel()
//______________________________________________________________________________
void AliEveEventManagerWindow::Update(int state)
{
AliESDEvent* esd = fM->GetESD();
AliStorageAdministratorPanelListEvents* listEventsTab = AliStorageAdministratorPanelListEvents::GetInstance();
AliEveConfigManager *configManager = AliEveConfigManager::GetMaster();

Bool_t autoLoad = fM->GetAutoLoad();
Bool_t extCtrl = fM->IsUnderExternalControl();
Bool_t evNavOn = !autoLoad && !extCtrl;

#ifdef ZMQ

AliESDEvent* esd = fM->GetESD();
AliStorageAdministratorPanelListEvents* listEventsTab = AliStorageAdministratorPanelListEvents::GetInstance();
AliEveConfigManager *configManager = AliEveConfigManager::GetMaster();

if (!fM->IsOnlineMode()) {

listEventsTab->SetOfflineMode(kTRUE);
Expand Down Expand Up @@ -365,6 +368,7 @@ void AliEveEventManagerWindow::Update(int state)
fMarkEvent ->SetEnabled(kTRUE);
listEventsTab->SetOfflineMode(kFALSE);
}
#endif

if (1 == state) {
fRefresh ->SetEnabled(evNavOn);
Expand Down Expand Up @@ -401,6 +405,8 @@ void AliEveEventManagerWindow::Update(int state)

void AliEveEventManagerWindow::StorageManagerChangedState(int state)
{
#ifdef ZMQ

Bool_t autoLoad = fM->GetAutoLoad();
AliStorageAdministratorPanelListEvents* listEventsTab = AliStorageAdministratorPanelListEvents::GetInstance();
AliEveConfigManager *configManager = AliEveConfigManager::GetMaster();
Expand Down Expand Up @@ -431,6 +437,7 @@ void AliEveEventManagerWindow::StorageManagerChangedState(int state)
fEventId->SetState(!autoLoad);
}
}
#endif
}

//------------------------------------------------------------------------------
Expand Down
109 changes: 66 additions & 43 deletions STEER/AOD/AliAODPWG4Particle.cxx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,10 @@
/* $Id: AliAODPWG4Particle.h $ */

//-------------------------------------------------------------------------
// AOD class for photon and other particles storage and
// correlation studies
// Author: Yves Schutz, CERN, Gustavo Conesa, INFN
// AOD objects class in use in the CaloTrackCorrelations
// analysis pacackge ($ALICE_ROOT/PWGGA/CaloTrackCorrelations)
//
// Author: Gustavo Conesa Balbastre - CNRS-LPSC-Grenoble
//-------------------------------------------------------------------------

//-- ROOT system --
Expand All @@ -32,8 +33,12 @@ ClassImp(AliAODPWG4Particle)
//______________________________________________________________________________
AliAODPWG4Particle::AliAODPWG4Particle() :
AliVParticle(),
fMomentum(0),fPdg(-1), fTag(0), fBtag(-1), fLabel(-1), fCaloLabel(), fTrackLabel(),
fDetector(""), fDisp(0), fTof(0), fCharged(0), fTagged(0), fBadDist(0), fFidArea(0), fInputFileIndex(0)
fMomentum(0),fPdg(-1), fTag(0), fLabel(-1),
fCaloLabel(), fTrackLabel(),fDetector(""), fDetectorTag(0),
fDisp(0), fTof(0), fCharged(0), fDecayTag(-1),
fBadDist(0), fNLM(0), fM02(0),
fIsolated(0), fLeadingParticle(0),
fTagged(0), fFidArea(0), fInputFileIndex(0),fBtag(-1)
{
// constructor
fCaloLabel [0] = -1;
Expand All @@ -47,8 +52,12 @@ fDetector(""), fDisp(0), fTof(0), fCharged(0), fTagged(0), fBadDist(0), fFidArea
//______________________________________________________________________________
AliAODPWG4Particle::AliAODPWG4Particle(Double_t px, Double_t py, Double_t pz, Double_t e):
AliVParticle(),
fMomentum(0),fPdg(-1), fTag(0), fBtag(-1), fLabel(-1),fCaloLabel(), fTrackLabel(),
fDetector(""), fDisp(0), fTof(0),fCharged(0), fTagged(0), fBadDist(0), fFidArea(0), fInputFileIndex(0)
fMomentum(0),fPdg(-1), fTag(0), fLabel(-1),
fCaloLabel(), fTrackLabel(),fDetector(""), fDetectorTag(0),
fDisp(0), fTof(0), fCharged(0), fDecayTag(-1),
fBadDist(0), fNLM(0), fM02(0),
fIsolated(0), fLeadingParticle(0),
fTagged(0), fFidArea(0), fInputFileIndex(0),fBtag(-1)
{
// constructor
fMomentum = new TLorentzVector(px, py, pz, e);
Expand All @@ -64,8 +73,12 @@ AliAODPWG4Particle::AliAODPWG4Particle(Double_t px, Double_t py, Double_t pz, Do
//______________________________________________________________________________
AliAODPWG4Particle::AliAODPWG4Particle(TLorentzVector & p):
AliVParticle(),
fMomentum(0),fPdg(-1), fTag(0), fBtag(-1), fLabel(-1),fCaloLabel(), fTrackLabel(),
fDetector(""), fDisp(0), fTof(0), fCharged(0), fTagged(0), fBadDist(0), fFidArea(0), fInputFileIndex(0)
fMomentum(0),fPdg(-1), fTag(0), fLabel(-1),
fCaloLabel(), fTrackLabel(),fDetector(""), fDetectorTag(0),
fDisp(0), fTof(0), fCharged(0), fDecayTag(-1),
fBadDist(0), fNLM(0), fM02(0),
fIsolated(0), fLeadingParticle(0),
fTagged(0), fFidArea(0), fInputFileIndex(0),fBtag(-1)
{
// constructor
fMomentum = new TLorentzVector(p);
Expand Down Expand Up @@ -96,10 +109,11 @@ void AliAODPWG4Particle::Clear(const Option_t* /*opt*/)
//______________________________________________________________________________
AliAODPWG4Particle::AliAODPWG4Particle(const AliAODPWG4Particle& part) :
AliVParticle(part),
fMomentum(0), fPdg(part.fPdg), fTag(part.fTag), fBtag(part.fBtag), fLabel(part.fLabel),
fCaloLabel(), fTrackLabel(), fDetector(part.fDetector),fDisp(part.fDisp),
fTof(part.fTof), fCharged(part.fCharged), fTagged(part.fTagged), fBadDist(part.fBadDist),
fFidArea(part.fFidArea), fInputFileIndex(part.fInputFileIndex)
fMomentum(0), fPdg(part.fPdg), fTag(part.fTag), fLabel(part.fLabel),
fCaloLabel(), fTrackLabel(), fDetector(part.fDetector), fDetectorTag(part.fDetectorTag),
fDisp(part.fDisp), fTof(part.fTof), fCharged(part.fCharged), fDecayTag(part.fDecayTag),fBadDist(part.fBadDist),
fNLM(part.fNLM), fM02(part.fM02), fIsolated(part.fIsolated), fLeadingParticle(part.fLeadingParticle),
fTagged(part.fTagged), fFidArea(part.fFidArea), fInputFileIndex(part.fInputFileIndex),fBtag(part.fBtag)
{
// Copy constructor
fMomentum = new TLorentzVector(*part.fMomentum);
Expand All @@ -112,57 +126,64 @@ AliAODPWG4Particle::AliAODPWG4Particle(const AliAODPWG4Particle& part) :
fTrackLabel[3] = part.fTrackLabel[3];
}

//______________________________________________________________________________
AliAODPWG4Particle& AliAODPWG4Particle::operator=(const AliAODPWG4Particle& part)
//________________________________________________________________________________
AliAODPWG4Particle& AliAODPWG4Particle::operator=(const AliAODPWG4Particle & part)
{
// Assignment operator
if(this!=&part) {
if(this!=&part)
{
fPdg = part.fPdg;
fTag = part.fTag;
fBtag = part.fBtag;
fLabel = part.fLabel;
fCaloLabel [0] = part.fCaloLabel[0];
fCaloLabel [1] = part.fCaloLabel[1];
fTrackLabel[0] = part.fTrackLabel[0];
fTrackLabel[1] = part.fTrackLabel[1];


fDetectorTag = part.fDetectorTag;
fDetector = part.fDetector;
fDisp = part.fDisp;
fTof = part.fTof;
fCharged = part.fCharged;
fTagged = part.fTagged;
fDisp = part.fDisp;
fTof = part.fTof;
fCharged = part.fCharged;
fBadDist = part.fBadDist;
fFidArea = part.fFidArea;
fInputFileIndex = part.fInputFileIndex;

if (fMomentum ) delete fMomentum;
fDecayTag = part.fDecayTag;

fNLM = part.fNLM;
fM02 = part.fM02;
fIsolated = part.fIsolated;
fLeadingParticle =part.fLeadingParticle;

fBtag = part.fBtag;
fFidArea = part.fFidArea;
fTagged = part.fTagged;
fInputFileIndex = part.fInputFileIndex;

if (fMomentum ) delete fMomentum;
fMomentum = new TLorentzVector(*part.fMomentum);
}

return *this;
}


//_______________________________________________________________
Bool_t AliAODPWG4Particle::IsPIDOK(const Int_t ipid, const Int_t pdgwanted) const{
// returns true if particle satisfies given PID criterium
switch(ipid){
case 0: return kTRUE ; //No PID at all
case 1:
case 0: return kTRUE ; //No PID at all
case 1:
{
if (fPdg == pdgwanted) return kTRUE;
if (fPdg == pdgwanted) return kTRUE;
else return kFALSE; //Overall PID calculated with bayesian methods.
}
case 2: return fDisp ; //only dispersion cut
case 3: return fTof ; //Only TOF cut
case 4: return fCharged ; //Only Charged cut
case 5: return fDisp && fTof ; //Dispersion and TOF
case 6: return fDisp && fCharged ; //Dispersion and Charged
case 7: return fTof && fCharged ; //TOF and Charged
case 8: return fDisp && fTof && fCharged ; // all 3 cuts
default: return kFALSE ; //Not known combination
case 2: return fDisp ; //only dispersion cut
case 3: return fTof ; //Only TOF cut
case 4: return fCharged ; //Only Charged cut
case 5: return fDisp && fTof ; //Dispersion and TOF
case 6: return fDisp && fCharged ; //Dispersion and Charged
case 7: return fTof && fCharged ; //TOF and Charged
case 8: return fDisp && fTof && fCharged ; // all 3 cuts
default: return kFALSE ; //Not known combination
}
}

Expand All @@ -182,10 +203,12 @@ void AliAODPWG4Particle::Print(Option_t* /*option*/) const
printf("PDG : %d\n",fPdg);
printf("Tag : %d\n",fTag);
printf("Btag : %d\n",fBtag);
printf("Pi0 Tag : %d\n",fTagged);
printf("Pi0 Tag : %d\n",fDecayTag);
printf("Dist. to bad channel : %d\n",fBadDist);
printf("Fid Area : %d\n",fFidArea);
printf("Input File Index : %d\n",fInputFileIndex);
printf("Detector : %s\n",fDetector.Data());

printf("Detector : %d\n",fDetectorTag);
if(fIsolated) printf("Isolated! \n");
if(fLeadingParticle) printf("Leading! \n");

}
Loading

0 comments on commit 440ba47

Please sign in to comment.