]> git.uio.no Git - u/mrichter/AliRoot.git/blobdiff - PWG4/totEt/AliAnalysisEtMonteCarlo.cxx
create the histogram of cluster time difference when combining clusters and not the...
[u/mrichter/AliRoot.git] / PWG4 / totEt / AliAnalysisEtMonteCarlo.cxx
index 1fb6865a822cfdc51b10355d10989c3ca07c8742..3408dcc152a672204f32f19ac951a274b2431944 100644 (file)
@@ -35,48 +35,6 @@ AliAnalysisEtMonteCarlo::AliAnalysisEtMonteCarlo():AliAnalysisEt()
         ,fImpactParameter(0)
         ,fNcoll(0)
         ,fNpart(0)
-        ,fHistPrimElectronEtaEET(0)
-        ,fHistSecElectronEtaEET(0)
-        ,fHistConvElectronEtaEET(0)
-        ,fHistPrimGammaEtaEET(0)
-        ,fHistPion0GammaEtaEET(0)
-        ,fHistEtaGammaEtaEET(0)
-        ,fHistOmega0GammaEtaEET(0)
-        ,fHistSecGammaEtaEET(0)
-
-        ,fHistPrimElectronEtaE(0)
-        ,fHistSecElectronEtaE(0)
-        ,fHistConvElectronEtaE(0)
-        ,fHistPrimGammaEtaE(0)
-        ,fHistPion0GammaEtaE(0)
-        ,fHistEtaGammaEtaE(0)
-        ,fHistOmega0GammaEtaE(0)
-        ,fHistSecGammaEtaE(0)
-
-        ,fHistPrimElectronEtaERec(0)
-        ,fHistSecElectronEtaERec(0)
-        ,fHistConvElectronEtaERec(0)
-        ,fHistPrimGammaEtaERec(0)
-        ,fHistSecGammaEtaERec(0)
-        ,fHistPion0GammaEtaERec(0)
-        ,fHistEtaGammaEtaERec(0)
-        ,fHistOmega0GammaEtaERec(0)
-
-        ,fHistAllERecEMC(0)
-        ,fHistGammaERecEMC(0)
-        ,fHistElectronERecEMC(0)
-
-        ,fHistElectronFirstMother(0)
-        ,fHistElectronLastMother(0)
-        ,fHistElectronFirstMotherEtaAcc(0)
-        ,fHistElectronFirstMotherNPP(0)
-        ,fHistElectronFirstMotherNPPAcc(0)
-
-        ,fHistGammaFirstMother(0)
-        ,fHistGammaLastMother(0)
-        ,fHistGammaFirstMotherEtaAcc(0)
-        ,fHistGammaFirstMotherNPP(0)
-        ,fHistGammaFirstMotherNPPAcc(0)
 
         ,fHistDecayVertexNonRemovedCharged(0)
         ,fHistDecayVertexRemovedCharged(0)
@@ -199,7 +157,79 @@ AliAnalysisEtMonteCarlo::AliAnalysisEtMonteCarlo():AliAnalysisEt()
 
 // dtor
 AliAnalysisEtMonteCarlo::~AliAnalysisEtMonteCarlo()
-{
+{//Destructor
+       delete fHistDecayVertexNonRemovedCharged; // Decay vertex for non-removed charged particles
+       delete fHistDecayVertexRemovedCharged; // Decay vertex for non-removed charged particles
+       delete fHistDecayVertexNonRemovedNeutral; // Decay vertex for non-removed charged particles
+       delete fHistDecayVertexRemovedNeutral; // Decay vertex for non-removed charged particles
+       
+       delete fHistRemovedOrNot; // If charged/neutral particles were removed or not
+       
+       delete fHistEtNonRemovedProtons; // enter comment here
+       delete fHistEtNonRemovedAntiProtons; // enter comment here
+       delete fHistEtNonRemovedPiPlus; // enter comment here
+       delete fHistEtNonRemovedPiMinus; // enter comment here
+       delete fHistEtNonRemovedKaonPlus; // enter comment here
+       delete fHistEtNonRemovedKaonMinus; // enter comment here
+       delete fHistEtNonRemovedK0s; // enter comment here
+       delete fHistEtNonRemovedLambdas; // enter comment here
+       delete fHistEtNonRemovedElectrons; // enter comment here
+       delete fHistEtNonRemovedPositrons; // enter comment here
+       delete fHistEtNonRemovedMuPlus; // enter comment here
+       delete fHistEtNonRemovedMuMinus; // enter comment here
+       delete fHistEtNonRemovedNeutrons; // enter comment here
+       delete fHistEtNonRemovedAntiNeutrons; // enter comment here
+       delete fHistEtNonRemovedGammas; // enter comment here
+       delete fHistEtNonRemovedGammasFromPi0; // enter comment here
+       
+       delete fHistEtRemovedGammas; // enter comment here
+       delete fHistEtRemovedNeutrons; // enter comment here
+       delete fHistEtRemovedAntiNeutrons; // enter comment here
+       
+       
+       delete fHistMultNonRemovedProtons; // enter comment here 
+       delete fHistMultNonRemovedAntiProtons; // enter comment here 
+       delete fHistMultNonRemovedPiPlus; // enter comment here 
+       delete fHistMultNonRemovedPiMinus; // enter comment here 
+       delete fHistMultNonRemovedKaonPlus; // enter comment here 
+       delete fHistMultNonRemovedKaonMinus; // enter comment here 
+       delete fHistMultNonRemovedK0s; // enter comment here 
+       delete fHistMultNonRemovedLambdas; // enter comment here 
+       delete fHistMultNonRemovedElectrons; // enter comment here 
+       delete fHistMultNonRemovedPositrons; // enter comment here 
+       delete fHistMultNonRemovedMuPlus; // enter comment here
+       delete fHistMultNonRemovedMuMinus; // enter comment here
+       delete fHistMultNonRemovedNeutrons; // enter comment here
+       delete fHistMultNonRemovedAntiNeutrons; // enter comment here
+       delete fHistMultNonRemovedGammas; // enter comment here
+       
+       delete fHistMultRemovedGammas; // enter comment here
+       delete fHistMultRemovedNeutrons; // enter comment here
+       delete fHistMultRemovedAntiNeutrons; // enter comment here
+       
+       delete fHistTrackMultvsNonRemovedCharged; // enter comment here
+       delete fHistTrackMultvsNonRemovedNeutral; // enter comment here
+       delete fHistTrackMultvsRemovedGamma; // enter comment here
+       
+       delete fHistClusterMultvsNonRemovedCharged; // enter comment here
+       delete fHistClusterMultvsNonRemovedNeutral; // enter comment here
+       delete fHistClusterMultvsRemovedGamma; // enter comment here
+       
+       delete fHistMultvsNonRemovedChargedE; // enter comment here
+       delete fHistMultvsNonRemovedNeutralE; // enter comment here
+       delete fHistMultvsRemovedGammaE; // enter comment here
+       delete fHistDxDzNonRemovedCharged; // enter comment here
+       delete fHistDxDzRemovedCharged; // enter comment here
+       delete fHistDxDzNonRemovedNeutral; // enter comment here
+       delete fHistDxDzRemovedNeutral; // enter comment here
+       
+       delete fHistPiPlusMult; // enter comment here
+       delete fHistPiMinusMult; // enter comment here
+       delete fHistPiZeroMult; // enter comment here
+
+       delete fHistPiPlusMultAcc; // enter comment here
+       delete fHistPiMinusMultAcc; // enter comment here
+       delete fHistPiZeroMultAcc; // enter comment here
 }
 
 Int_t AliAnalysisEtMonteCarlo::AnalyseEvent(AliVEvent* ev)
@@ -277,8 +307,8 @@ Int_t AliAnalysisEtMonteCarlo::AnalyseEvent(AliVEvent* ev)
     {
 
         TParticle *part = stack->Particle(iPart);
-        TParticle *partMom = 0;
-        TParticle *partMomLast = 0;
+//         TParticle *partMom = 0;
+//         TParticle *partMomLast = 0;
 
         if (!part)
         {
@@ -286,12 +316,12 @@ Int_t AliAnalysisEtMonteCarlo::AnalyseEvent(AliVEvent* ev)
             continue;
         }
 
-        Int_t iPartMom = part->GetMother(0);
-        Int_t iPartLastMom = part->GetMother(1);
+//         Int_t iPartMom = part->GetMother(0);
+//         Int_t iPartLastMom = part->GetMother(1);
 
         TParticlePDG *pdg = part->GetPDG(0);
-        TParticlePDG *pdgMom = 0;
-        TParticlePDG *pdgMomLast = 0;
+        //TParticlePDG *pdgMom = 0;
+//         TParticlePDG *pdgMomLast = 0;
 
         if (!pdg)
         {
@@ -299,17 +329,17 @@ Int_t AliAnalysisEtMonteCarlo::AnalyseEvent(AliVEvent* ev)
             continue;
         }
 
-        if (iPartMom>0)
-        {
-            partMom = stack->Particle(iPartMom);
-            pdgMom = partMom->GetPDG(0);
-        }
+//         if (iPartMom>0)
+//         {
+//             partMom = stack->Particle(iPartMom);
+//             //pdgMom = partMom->GetPDG(0);
+//         }
 
-        if (iPartLastMom>0)
-        {
-            partMomLast = stack->Particle(iPartLastMom);
-            pdgMomLast = partMomLast->GetPDG(0);
-        }
+//         if (iPartLastMom>0)
+//         {
+//             partMomLast = stack->Particle(iPartLastMom);
+//             pdgMomLast = partMomLast->GetPDG(0);
+//         }
 
 
         Double_t particleMassPart = 0; //The mass part in the Et calculation for this particle
@@ -317,115 +347,6 @@ Int_t AliAnalysisEtMonteCarlo::AnalyseEvent(AliVEvent* ev)
         // Check if it is a primary particle
         //if (!stack->IsPhysicalPrimary(iPart)) continue;
 
-        // it goes to the next particle in case it is not a physical primary or not a electron or gamma (want to check the contribution from secondary)
-        if (!stack->IsPhysicalPrimary(iPart))
-        {
-            // this part is used only to check the origin of secondary electrons and gammas
-            if (iPartMom>0)
-            {
-                //if (!stack->IsPhysicalPrimary(iPartMom)) continue;
-
-                if (pdgMom)
-                {
-                    if ((pdg->PdgCode() == fgEPlusCode) || (pdg->PdgCode() == fgEMinusCode))
-                    {
-                        fHistElectronFirstMotherNPP->Fill(pdgMom->PdgCode());
-                        // inside EMCal acceptance
-                        if (TMath::Abs(part->Eta()) < fEtaCutAcc && part->Phi() < fPhiCutAccMax && part->Phi() > fPhiCutAccMin)
-                            fHistElectronFirstMotherNPPAcc->Fill(pdgMom->PdgCode());
-                    }
-                    else if (pdg->PdgCode() == fgGammaCode)
-                    {
-                        fHistGammaFirstMotherNPP->Fill(pdgMom->PdgCode());
-                        if (TMath::Abs(part->Eta()) < fEtaCutAcc && part->Phi() < fPhiCutAccMax && part->Phi() > fPhiCutAccMin)
-                            fHistGammaFirstMotherNPPAcc->Fill(pdgMom->PdgCode());
-                    }
-                }
-                else
-                {
-                    if ((pdg->PdgCode() == fgEPlusCode) || (pdg->PdgCode() == fgEMinusCode))
-                        fHistElectronFirstMotherNPP->Fill(-598);
-                    else if (pdg->PdgCode() == fgGammaCode)
-                        fHistGammaFirstMotherNPP->Fill(-598);
-
-                    continue;
-                }
-            }
-            else
-            {
-                if ((pdg->PdgCode() == fgEPlusCode) || (pdg->PdgCode() == fgEMinusCode))
-                    fHistElectronFirstMotherNPP->Fill(-599);
-                else if (pdg->PdgCode() == fgGammaCode)
-                    fHistGammaFirstMotherNPP->Fill(-599);
-
-                continue;
-            }
-
-            if (!((pdg->PdgCode() == fgEPlusCode) || (pdg->PdgCode() == fgEMinusCode) || (pdg->PdgCode() == fgGammaCode)))
-                continue;
-        }
-        // this part is used only to check the origin of physical primary electrons and gammas
-        else
-        {
-            if (iPartMom>0)
-            {
-                if (pdgMom)
-                {
-                    if ((pdg->PdgCode() == fgEPlusCode) || (pdg->PdgCode() == fgEMinusCode))
-                        fHistElectronFirstMother->Fill(pdgMom->PdgCode());
-                    else if (pdg->PdgCode() == fgGammaCode)
-                        fHistGammaFirstMother->Fill(pdgMom->PdgCode());
-
-                    if (TMath::Abs(part->Eta()) < fCuts->GetCommonEtaCut())
-                    {
-                        if ((pdg->PdgCode() == fgEPlusCode) || (pdg->PdgCode() == fgEMinusCode))
-                            fHistElectronFirstMotherEtaAcc->Fill(pdgMom->PdgCode());
-                        else if (pdg->PdgCode() == fgGammaCode)
-                            fHistGammaFirstMotherEtaAcc->Fill(pdgMom->PdgCode());
-                    }
-                }
-                else
-                {
-                    if ((pdg->PdgCode() == fgEPlusCode) || (pdg->PdgCode() == fgEMinusCode))
-                        fHistElectronFirstMother->Fill(-598);
-                    else if (pdg->PdgCode() == fgGammaCode)
-                        fHistGammaFirstMother->Fill(-598);
-                }
-            }
-            else
-            {
-                if ((pdg->PdgCode() == fgEPlusCode) || (pdg->PdgCode() == fgEMinusCode))
-                    fHistElectronFirstMother->Fill(-599);
-                else if (pdg->PdgCode() == fgGammaCode)
-                    fHistGammaFirstMother->Fill(-599);
-            }
-
-            if (iPartLastMom>0)
-            {
-                if (pdgMomLast)
-                {
-                    if ((pdg->PdgCode() == fgEPlusCode) || (pdg->PdgCode() == fgEMinusCode))
-                        fHistElectronLastMother->Fill(pdgMomLast->PdgCode());
-                    else if (pdg->PdgCode() == fgGammaCode)
-                        fHistGammaLastMother->Fill(pdgMomLast->PdgCode());
-                }
-                else
-                {
-                    if ((pdg->PdgCode() == fgEPlusCode) || (pdg->PdgCode() == fgEMinusCode))
-                        fHistElectronLastMother->Fill(-598);
-                    else if (pdg->PdgCode() == fgGammaCode)
-                        fHistGammaLastMother->Fill(-598);
-                }
-            }
-            else
-            {
-                if ((pdg->PdgCode() == fgEPlusCode) || (pdg->PdgCode() == fgEMinusCode))
-                    fHistElectronLastMother->Fill(-599);
-                else if (pdg->PdgCode() == fgGammaCode)
-                    fHistGammaLastMother->Fill(-599);
-            }
-        }
-
         //printf("MC: iPart %03d eta %4.3f phi %4.3f code %d charge %g \n", iPart, part->Eta(), part->Phi(), pdg->PdgCode(), pdg->Charge()); // tmp/debug printout
 
         // Check for reasonable (for now neutral and singly charged) charge on the particle
@@ -528,45 +449,6 @@ Int_t AliAnalysisEtMonteCarlo::AnalyseEvent(AliVEvent* ev)
                         if (et > fCuts->GetCommonClusterEnergyCut()) fTotNeutralEtAcc += et;
                         if (et > fCuts->GetCommonClusterEnergyCut()) fTotEtAcc += et;
                         if (part->Energy() > 0.05) partCount++;
-                        if (pdg->PdgCode() == fgGammaCode)
-                        {
-                            if (!stack->IsPhysicalPrimary(iPart))
-                            {
-                                fHistSecGammaEtaE->Fill(part->Energy(),part->Eta());
-                                fHistSecGammaEtaEET->Fill(part->Energy(),part->Eta(),et);
-                            }
-                            else
-                            {
-                                if (pdgMom)
-                                {
-                                    if (pdgMom->PdgCode() == fgPi0Code)
-                                    {
-                                        fHistPion0GammaEtaE->Fill(part->Energy(),part->Eta());
-                                        fHistPion0GammaEtaEET->Fill(part->Energy(),part->Eta(),et);
-                                    }
-                                    else if (pdgMom->PdgCode() == fgOmega0Code)
-                                    {
-                                        fHistOmega0GammaEtaE->Fill(part->Energy(),part->Eta());
-                                        fHistOmega0GammaEtaEET->Fill(part->Energy(),part->Eta(),et);
-                                    }
-                                    else if (pdgMom->PdgCode() == fgEtaCode)
-                                    {
-                                        fHistEtaGammaEtaE->Fill(part->Energy(),part->Eta());
-                                        fHistEtaGammaEtaEET->Fill(part->Energy(),part->Eta(),et);
-                                    }
-                                    else
-                                    {
-                                        fHistPrimGammaEtaE->Fill(part->Energy(),part->Eta());
-                                        fHistPrimGammaEtaEET->Fill(part->Energy(),part->Eta(),et);
-                                    }
-                                }
-                                else
-                                {
-                                    fHistPrimGammaEtaE->Fill(part->Energy(),part->Eta());
-                                    fHistPrimGammaEtaEET->Fill(part->Energy(),part->Eta(),et);
-                                }
-                            }
-                        }
                     }
                 }
                 //Charged particles
@@ -597,42 +479,11 @@ Int_t AliAnalysisEtMonteCarlo::AnalyseEvent(AliVEvent* ev)
                         {
                             fMuonEtAcc += et;
                         }
-                        /*
-                          if (pdg->PdgCode() == fgEPlusCode || pdg->PdgCode() == fgEMinusCode)
-                          {
-                          fElectronEtAcc += et;
-                          }
-                        */
+                        
                         if (pdg->PdgCode() == fgEPlusCode || pdg->PdgCode() == fgEMinusCode)
                         {
-                            if (!stack->IsPhysicalPrimary(iPart))
-                            {
-                                if (pdgMom)
-                                {
-                                    if ((pdgMom->PdgCode() == fgGammaCode) && (stack->IsPhysicalPrimary(iPartMom)))
-                                    {
-                                        fHistConvElectronEtaE->Fill(part->Energy(),part->Eta());
-                                        fHistConvElectronEtaEET->Fill(part->Energy(),part->Eta(),et);
-                                    }
-                                    else
-                                    {
-                                        fHistSecElectronEtaE->Fill(part->Energy(),part->Eta());
-                                        fHistSecElectronEtaEET->Fill(part->Energy(),part->Eta(),et);
-                                    }
-                                }
-                                else
-                                {
-                                    fHistSecElectronEtaE->Fill(part->Energy(),part->Eta());
-                                    fHistSecElectronEtaEET->Fill(part->Energy(),part->Eta(),et);
-                                }
-                            }
-                            else
-                            {
-                                fElectronEtAcc += et;
-                                fHistPrimElectronEtaE->Fill(part->Energy(),part->Eta());
-                                fHistPrimElectronEtaEET->Fill(part->Energy(),part->Eta(),et);
-                            }
-                        } // electron
+                          fElectronEtAcc += et;
+                        }
                     } // inside EMCal acceptance
 
                     //   if (TrackHitsCalorimeter(part, event->GetMagneticField()))
@@ -717,7 +568,7 @@ Int_t AliAnalysisEtMonteCarlo::AnalyseEvent(AliVEvent* ev,AliVEvent* ev2)
     for (int iCluster = 0; iCluster < nCluster; iCluster++ )
     {
         AliESDCaloCluster* caloCluster = ( AliESDCaloCluster* )caloClusters->At( iCluster );
-        Float_t caloE = caloCluster->E();
+        //Float_t caloE = caloCluster->E();
 
         UInt_t iPart = (UInt_t)TMath::Abs(caloCluster->GetLabel());
         TParticle *part  = stack->Particle(iPart);
@@ -730,7 +581,7 @@ Int_t AliAnalysisEtMonteCarlo::AnalyseEvent(AliVEvent* ev,AliVEvent* ev2)
         }
 
         // compare MC and Rec energies for all particles
-        fHistAllERecEMC->Fill(part->Energy(),caloE);
+        //fHistAllERecEMC->Fill(part->Energy(),caloE);
 
         TParticlePDG *pdg = part->GetPDG(0);
         TParticlePDG *pdgMom = 0;
@@ -759,73 +610,6 @@ Int_t AliAnalysisEtMonteCarlo::AnalyseEvent(AliVEvent* ev,AliVEvent* ev2)
 
         if (TMath::Abs(TMath::Abs(pdg->Charge()) - fCuts->GetMonteCarloSingleChargedParticle())<1e-3 && TMath::Abs(TMath::Abs(pdg->Charge()) - fCuts->GetMonteCarloNeutralParticle())<1e-3) continue;
 
-        if (pdg->PdgCode() == fgGammaCode)
-        {
-            // compare MC and Rec energies for gammas
-            fHistGammaERecEMC->Fill(part->Energy(),caloE);
-
-            if (!stack->IsPhysicalPrimary(iPart))
-            {
-                fHistSecGammaEtaERec->Fill(part->Energy(),part->Eta());
-            }
-            else
-            {
-                if (pdgMom)
-                {
-                    if (pdgMom->PdgCode() == fgPi0Code)
-                    {
-                        fHistPion0GammaEtaERec->Fill(part->Energy(),part->Eta());
-                    }
-                    else if (partMom->GetPDG(0)->PdgCode() == fgOmega0Code)
-                    {
-                        fHistOmega0GammaEtaERec->Fill(part->Energy(),part->Eta());
-                    }
-                    else if (partMom->GetPDG(0)->PdgCode() == fgEtaCode)
-                    {
-                        fHistEtaGammaEtaERec->Fill(part->Energy(),part->Eta());
-                    }
-                    else
-                    {
-                        fHistPrimGammaEtaERec->Fill(part->Energy(),part->Eta());
-                    }
-                }
-                else
-                {
-                    fHistPrimGammaEtaERec->Fill(part->Energy(),part->Eta());
-                }
-            }
-        } // gamma
-
-        if (pdg->PdgCode() == fgEPlusCode || pdg->PdgCode() == fgEMinusCode)
-        {
-            // compare MC and Rec energies for electrons
-            fHistElectronERecEMC->Fill(part->Energy(),caloE);
-
-            if (!stack->IsPhysicalPrimary(iPart))
-            {
-                if (pdgMom)
-                {
-                    if ((pdgMom->PdgCode() == fgGammaCode) && (stack->IsPhysicalPrimary(iPartMom)))
-                    {
-                        fHistConvElectronEtaERec->Fill(part->Energy(),part->Eta());
-                    }
-                    else
-                    {
-                        fHistSecElectronEtaERec->Fill(part->Energy(),part->Eta());
-                    }
-                }
-                else
-                {
-                    fHistSecElectronEtaERec->Fill(part->Energy(),part->Eta());
-                }
-            }
-            else
-            {
-                fHistPrimElectronEtaERec->Fill(part->Energy(),part->Eta());
-            }
-        }
-
-
         Double_t clEt = CalculateTransverseEnergy(caloCluster);
         if (caloCluster->E() < fCuts->GetCommonClusterEnergyCut()) continue;
         Float_t pos[3];
@@ -1107,57 +891,7 @@ void AliAnalysisEtMonteCarlo::CreateHistograms()
         fTree->Branch("fNcoll",&fNcoll,"fNcoll/I");
         fTree->Branch("fNpart",&fNpart,"fNpart/I");
     }
-    fHistPrimElectronEtaEET = CreateEtaEHisto2D("fHistPrimElectronEtaEET","MC E_{T}, primary electrons","E_{T}(GeV)");
-    fHistSecElectronEtaEET = CreateEtaEHisto2D("fHistSecElectronEtaEET","MC E_{T}, secondary (no conversion) electrons","E_{T}(GeV)");
-    fHistConvElectronEtaEET = CreateEtaEHisto2D("fHistConvElectronEtaEET","MC E_{T}, electrons from conversion","E_{T}(GeV)");
-    fHistPrimGammaEtaEET = CreateEtaEHisto2D("fHistPrimGammaEtaEET","MC E_{T}, primary gammas","E_{T}(GeV)");
-    fHistPion0GammaEtaEET = CreateEtaEHisto2D("fHistPion0GammaEtaEET","MC E_{T}, #pi^{0}","E_{T}(GeV)");
-    fHistOmega0GammaEtaEET = CreateEtaEHisto2D("fHistOmega0GammaEtaEET","MC E_{T}, #omega^{0}","E_{T}(GeV)");
-    fHistEtaGammaEtaEET = CreateEtaEHisto2D("fHistEtaGammaEtaEET","MC E_{T}, #eta","E_{T}(GeV)");
-    fHistSecGammaEtaEET = CreateEtaEHisto2D("fHistSecGammaEtaEET","MC E_{T}, secondary (no #pi^{0}, #eta or #omega) gammas","E_{T}(GeV)");
-
-    fHistPrimElectronEtaE = CreateEtaEHisto2D("fHistPrimElectronEtaE","MC E_{T}, primary electrons","#");
-    fHistSecElectronEtaE = CreateEtaEHisto2D("fHistSecElectronEtaE","MC E_{T}, secondary (no conversion) electrons","#");
-    fHistConvElectronEtaE = CreateEtaEHisto2D("fHistConvElectronEtaE","MC E_{T}, electrons from conversion","#");
-    fHistPrimGammaEtaE = CreateEtaEHisto2D("fHistPrimGammaEtaE","MC E_{T}, primary gammas","#");
-    fHistPion0GammaEtaE = CreateEtaEHisto2D("fHistPion0GammaEtaE","MC E_{T}, #pi^{0}","#");
-    fHistOmega0GammaEtaE = CreateEtaEHisto2D("fHistOmega0GammaEtaE","MC E_{T}, #omega^{0}","#");
-    fHistEtaGammaEtaE = CreateEtaEHisto2D("fHistEtaGammaEtaE","MC E_{T}, #eta","#");
-    fHistSecGammaEtaE = CreateEtaEHisto2D("fHistSecGammaEtaE","MC E_{T}, secondary (no #pi^{0}, #eta or #omega) gammas","#");
-
-    fHistPrimElectronEtaERec = CreateEtaEHisto2D("fHistPrimElectronEtaERec","MC E_{T}, primary electrons","#");
-    fHistSecElectronEtaERec = CreateEtaEHisto2D("fHistSecElectronEtaERec","MC E_{T}, secondary (no conversion) electrons","#");
-    fHistConvElectronEtaERec = CreateEtaEHisto2D("fHistConvElectronEtaERec","MC E_{T}, electrons from conversion","#");
-    fHistPrimGammaEtaERec = CreateEtaEHisto2D("fHistPrimGammaEtaERec","MC E_{T}, primary gammas","#");
-    fHistPion0GammaEtaERec = CreateEtaEHisto2D("fHistPion0GammaEtaERec","MC E_{T}, #pi^{0}","#");
-    fHistOmega0GammaEtaERec = CreateEtaEHisto2D("fHistOmega0GammaEtaERec","MC E_{T}, #omega","#");
-    fHistEtaGammaEtaERec = CreateEtaEHisto2D("fHistEtaGammaEtaERec","MC E_{T}, #eta","#");
-    fHistSecGammaEtaERec = CreateEtaEHisto2D("fHistSecGammaEtaERec","MC E_{T}, secondary (no #pi^{0}, #eta or #omega) gammas","#");
-
-    fHistAllERecEMC = new TH2F("fHistAllERecEMC","E cluster Rec vs MC, all particles",fgNumOfEBins, fgEAxis,fgNumOfEBins, fgEAxis);
-    fHistAllERecEMC->SetXTitle("E_{MC}(GeV)");
-    fHistAllERecEMC->SetYTitle("E_{Rec}(GeV)");
-
-    fHistElectronERecEMC = new TH2F("fHistElectronERecEMC","E cluster Rec vs MC, Electrons",fgNumOfEBins, fgEAxis,fgNumOfEBins, fgEAxis);
-    fHistElectronERecEMC->SetXTitle("E_{MC}(GeV)");
-    fHistElectronERecEMC->SetYTitle("E_{Rec}(GeV)");
-
-    fHistGammaERecEMC = new TH2F("fHistGammaERecEMC","E cluster Rec vs MC, Gammas",fgNumOfEBins, fgEAxis,fgNumOfEBins, fgEAxis);
-    fHistGammaERecEMC->SetXTitle("E_{MC}(GeV)");
-    fHistGammaERecEMC->SetYTitle("E_{Rec}(GeV)");
-
-    fHistElectronFirstMother = new TH1F("fHistElectronFirstMother","Electron First Mother PDG Code Distribution",1201,-600.5,600.5);
-    fHistElectronLastMother = new TH1F("fHistElectronLastMother","Electron Last Mother PDG Code Distribution",1201,-600.5,600.5);
-    fHistElectronFirstMotherEtaAcc = new TH1F("fHistElectronFirstMotherEtaAcc","Electron First Mother PDG Code Distribution",1201,-600.5,600.5);
-    fHistElectronFirstMotherNPP = new TH1F("fHistElectronFirstMotherNPP","Electron First Mother PDG Code Distribution",1201,-600.5,600.5);
-    fHistElectronFirstMotherNPPAcc = new TH1F("fHistElectronFirstMotherNPPAcc","Electron First Mother PDG Code Distribution",1201,-600.5,600.5);
-
-    fHistGammaFirstMother = new TH1F("fHistGammaFirstMother","Gamma First Mother PDG Code Distribution",1201,-600.5,600.5);
-    fHistGammaLastMother = new TH1F("fHistGammaLastMother","Gamma Last Mother PDG Code Distribution",1201,-600.5,600.5);
-    fHistGammaFirstMotherEtaAcc = new TH1F("fHistGammaFirstMotherEtaAcc","Gamma First Mother PDG Code Distribution",1201,-600.5,600.5);
-    fHistGammaFirstMotherNPP = new TH1F("fHistGammaFirstMotherNPP","Gamma First Mother PDG Code Distribution",1201,-600.5,600.5);
-    fHistGammaFirstMotherNPPAcc = new TH1F("fHistGammaFirstMotherNPP","Gamma First Mother PDG Code Distribution",1201,-600.5,600.5);
-
+       
     //fHistDecayVertexNonRemovedCharged = new TH3F("fHistDecayVertexNonRemovedCharged","fHistDecayVertexNonRemovedCharged", 500, -470, 30, 500, -300, 300, 40, -20, 20);
     //fHistDecayVertexRemovedCharged = new TH3F("fHistDecayVertexRemovedCharged","fHistDecayVertexRemovedCharged", 500, -470, 30, 500, -300, 300, 40, -20, 20);
     //fHistDecayVertexNonRemovedNeutral = new TH3F("fHistDecayVertexNonRemovedNeutral","fHistDecayVertexNonRemovedNeutral", 500, -470, 30, 500, -300, 300, 40, -20, 20);
@@ -1235,49 +969,6 @@ void AliAnalysisEtMonteCarlo::FillOutputList(TList *list)
 {//fill the output list
     AliAnalysisEt::FillOutputList(list);
 
-    list->Add(fHistPrimElectronEtaEET);
-    list->Add(fHistSecElectronEtaEET);
-    list->Add(fHistConvElectronEtaEET);
-    list->Add(fHistPrimGammaEtaEET);
-    list->Add(fHistPion0GammaEtaEET);
-    list->Add(fHistOmega0GammaEtaEET);
-    list->Add(fHistEtaGammaEtaEET);
-    list->Add(fHistSecGammaEtaEET);
-
-    list->Add(fHistPrimElectronEtaE);
-    list->Add(fHistSecElectronEtaE);
-    list->Add(fHistConvElectronEtaE);
-    list->Add(fHistPrimGammaEtaE);
-    list->Add(fHistPion0GammaEtaE);
-    list->Add(fHistOmega0GammaEtaE);
-    list->Add(fHistEtaGammaEtaE);
-    list->Add(fHistSecGammaEtaE);
-
-    list->Add(fHistPrimElectronEtaERec);
-    list->Add(fHistSecElectronEtaERec);
-    list->Add(fHistConvElectronEtaERec);
-    list->Add(fHistPrimGammaEtaERec);
-    list->Add(fHistPion0GammaEtaERec);
-    list->Add(fHistOmega0GammaEtaERec);
-    list->Add(fHistEtaGammaEtaERec);
-    list->Add(fHistSecGammaEtaERec);
-
-    list->Add(fHistAllERecEMC);
-    list->Add(fHistElectronERecEMC);
-    list->Add(fHistGammaERecEMC);
-
-    list->Add(fHistElectronFirstMother);
-    list->Add(fHistElectronLastMother);
-    list->Add(fHistElectronFirstMotherEtaAcc);
-    list->Add(fHistElectronFirstMotherNPP);
-    list->Add(fHistElectronFirstMotherNPPAcc);
-
-    list->Add(fHistGammaFirstMother);
-    list->Add(fHistGammaLastMother);
-    list->Add(fHistGammaFirstMotherEtaAcc);
-    list->Add(fHistGammaFirstMotherNPP);
-    list->Add(fHistGammaFirstMotherNPPAcc);
-
     list->Add(fHistRemovedOrNot);
 
     list->Add(fHistEtNonRemovedProtons);
@@ -1370,7 +1061,7 @@ bool AliAnalysisEtMonteCarlo::TrackHitsCalorimeter(TParticle* part, Double_t mag
 }
 
 void AliAnalysisEtMonteCarlo::FillHistograms()
-{
+{ // let base class fill its histograms, and us fill the local ones
     AliAnalysisEt::FillHistograms();
     //std::cout << fEtNonRemovedPiPlus << " " << fCentClass << std::endl;