More plots and neatening

diff --git a/EMCAL/AliEMCALJetFinderPlots.cxx b/EMCAL/AliEMCALJetFinderPlots.cxx
index cd683f563c58f8042985a47e11611983cba85809..34da866e60462d1a10044a9d2d3f4d26f2fc9402 100755 (executable)
--- a/EMCAL/AliEMCALJetFinderPlots.cxx
+++ b/EMCAL/AliEMCALJetFinderPlots.cxx
@@ -88,6 +88,9 @@ fhRecoBinFragmFcn =0;//new TH1F("fhRecoBinFragmFcn","Reconstructed Frag. Fcn",10
 fhRecoBinPartonFragmFcn =0;// new TH1F("fhRecoBinPartonFragmFcn","Input Bin Fragm Fcn Distribution",100,0,1);
 fhJetInvE=0;// = new TH1F("fhJetInvE","#frac{1}{E_{R}}",100,0,1);
 fhJetInvE2=0;// = new TH1F("fhJetInvE","#frac{1}{E_{R}}",100,0,1);
+
+
+
 }
 
 void AliEMCALJetFinderPlots::InitPlots()
@@ -229,7 +232,6 @@ fhJetInvE = new TH1F("fhJetInvE","#frac{1}{E_{R}}",100,0,1);
 fhJetInvE->Sumw2();
 fhJetInvE2 = new TH1F("fhJetInvE2","#frac{1}{E_{R}}",100,0,1);
 fhJetInvE2->Sumw2();
-                                                                                                                                                                        
                
 
 
@@ -287,8 +289,8 @@ delete        fhEtaPhiSpread;
        delete fhPartonPT2 ;// new TH1F("hPartonPT","Parton P_{T} Distribution",200,0,1);
        delete fhRecoBinFragmFcn;//new TH1F("fhRecoBinFragmFcn","Reconstructed Frag. Fcn",100,0,1);
        delete fhRecoBinPartonFragmFcn;// new TH1F("fhRecoBinPartonFragmFcn","Input Bin Fragm Fcn Distribution",100,0,1);
-        delete fhJetInvE;// = new TH1F("fhJetInvE","#frac{1}{E_{R}}",100,0,1);
-        delete fhJetInvE2;// = new TH1F("fhJetInvE","#frac{1}{E_{R}}",100,0,1);
+    delete fhJetInvE;// = new TH1F("fhJetInvE","#frac{1}{E_{R}}",100,0,1);
+    delete fhJetInvE2;// = new TH1F("fhJetInvE","#frac{1}{E_{R}}",100,0,1);
 
 }      
 
@@ -450,6 +452,7 @@ if (numappjet > 1)
       if ( (parton->Eta()-eta[iT])*(parton->Eta()-eta[iT]) +  
       (parton->Phi()-phi[iT])*(parton->Phi()-phi[iT]) < 0.2*0.2 ) 
              fhPartonJT2->Fill( correctp*sin(alpha));
+      fhPartonPT2->Fill(correctp*sin(tt));
       if (fNominalEnergy == 0.0) {
              fhPartonFragmFcn2->Fill(  correctp*sin(tt)/parton->Energy()  );
       }else 
@@ -494,6 +497,7 @@ if (numappjet > 1)
          if ( (jethighest->Eta()-eta[iT])*(jethighest->Eta()-eta[iT]) +  
                          (jethighest->Phi()-phi[iT])*(jethighest->Phi()-phi[iT]) < 0.2*0.2 )   
                  fhJetJT2->Fill( correctp*sin(alpha));
+         fhJetPT2->Fill(correctp*sin(tt));
          if (fNominalEnergy==0.0){
                  fhFragmFcn2->Fill(  correctp*sin(tt)/jethighest->Energy()  );
          } else
@@ -575,6 +579,7 @@ if (numappjet > 1)
              fhPartonJT->Fill( correctp*sin(alpha));
       if (fNominalEnergy == 0.0) {
              fhPartonFragmFcn->Fill(  correctp*sin(tt)/parton->Energy()  );
+         fhPartonPT->Fill(correctp*sin(tt));
       }else 
       {
               fhPartonFragmFcn->Fill(correctp*sin(tt)/fNominalEnergy);
@@ -618,6 +623,7 @@ if (numappjet > 1)
          if ( (jet->Eta()-eta[iT])*(jet->Eta()-eta[iT]) +  
                          (jet->Phi()-phi[iT])*(jet->Phi()-phi[iT]) < 0.2*0.2 )   
                  fhJetJT->Fill( correctp*sin(alpha));
+         fhJetPT->Fill(correctp*sin(tt));
          if (fNominalEnergy==0.0){
                  fhFragmFcn->Fill(  correctp*sin(tt)/jet->Energy()  ); // This is the jet fragmentation function
          } else

diff --git a/EMCAL/AliEMCALJetFinderPlots.h b/EMCAL/AliEMCALJetFinderPlots.h
index 17207354bec32fd883d1b925f5f6d2019c0e8966..218f54fc8e8e4a9b4ad2a39cb15b13108454d5ae 100755 (executable)
--- a/EMCAL/AliEMCALJetFinderPlots.h
+++ b/EMCAL/AliEMCALJetFinderPlots.h
@@ -35,6 +35,8 @@ class AliEMCALJetFinderPlots : public TObject
        // Only consider events with only 1 jet
        TH1F* GetFragmFcn(){return fhFragmFcn;} 
        TH1F* GetPartonFragmFcn(){return fhPartonFragmFcn;}     
+       TH1F* GetPT(){return fhJetPT;}  
+       TH1F* GetPartonPT(){return fhPartonPT;} 
        TH1F* GetJetJT(){return fhJetJT;}       
        TH1F* GetPartonJT(){return fhPartonJT;} 
        TH1F* GetJetPL(){return fhJetPL;}
@@ -53,6 +55,8 @@ class AliEMCALJetFinderPlots : public TObject
        // Only consider events with at least 2 jets
        TH1F* GetFragmFcn2(){return fhFragmFcn2;}       
        TH1F* GetPartonFragmFcn2(){return fhPartonFragmFcn2;}   
+       TH1F* GetPT2(){return fhJetPT2;}        
+       TH1F* GetPartonPT2(){return fhPartonPT2;}       
        TH1F* GetJetJT2(){return fhJetJT2;}     
        TH1F* GetPartonJT2(){return fhPartonJT2;}       
        TH1F* GetJetPL2(){return fhJetPL2;}
@@ -145,17 +149,16 @@ class AliEMCALJetFinderPlots : public TObject
        TH1F                            *fhRecoBinPartonPt;    // ("fhRecoBinPartonPt","Input Pt Distribution",100,0,1);
        TH1F                            *fhRecoBinJetEt;       // ("fhRecoJetEt","E_{T}^{reco}",250,0.,250.);
        TH1F                            *fhRecoBinInputJetEt;  // ("fhRecoInputJetEt","E_{T}^{reco}",250,0.,250.);
-        TH1F*                          fhJetPT ;// new TH1F("hJetPT","P_{T} Distribution",200,0,200);
-        TH1F*                          fhPartonPT ;// new TH1F("hPartonPT","Parton P_{T} Distribution",200,0,1);
-        TH1F*                          fhJetPT2 ;// new TH1F("hJetPT","P_{T} Distribution",200,0,200);
-        TH1F*                          fhPartonPT2 ;// new TH1F("hPartonPT","Parton P_{T} Distribution",200,0,1);
-        TH1F*                          fhRecoBinFragmFcn;//new TH1F("fhRecoBinFragmFcn","Reconstructed Frag. Fcn",100,0,1);
-        TH1F*                          fhRecoBinPartonFragmFcn;// new TH1F("fhRecoBinPartonFragmFcn","Input Bin Fragm Fcn Distribution",100,0,1);
+    TH1F*                              fhJetPT ;// new TH1F("hJetPT","P_{T} Distribution",200,0,200);
+    TH1F*                              fhPartonPT ;// new TH1F("hPartonPT","Parton P_{T} Distribution",200,0,1);
+    TH1F*                              fhJetPT2 ;// new TH1F("hJetPT","P_{T} Distribution",200,0,200);
+    TH1F*                              fhPartonPT2 ;// new TH1F("hPartonPT","Parton P_{T} Distribution",200,0,1);
+    TH1F*                              fhRecoBinFragmFcn;//new TH1F("fhRecoBinFragmFcn","Reconstructed Frag. Fcn",100,0,1);
+    TH1F*                              fhRecoBinPartonFragmFcn;// new TH1F("fhRecoBinPartonFragmFcn","Input Bin Fragm Fcn Distribution",100,0,1);
         
        TH1F*                           fhJetInvE;// new TH1F("fhJetInvE","#frac{1}{E_{R}}",100,0,1);
        TH1F*                           fhJetInvE2;// new TH1F("fhJetInvE2","#frac{1}{E_{R}}",100,0,1);
        
-       
        Bool_t                          fInitialised; // have histograms been initialised