From: cholm <cholm@f7af4fe6-9843-0410-8265-dc069ae4e863>
Date: Thu, 16 Dec 2010 15:29:58 +0000 (+0000)
Subject: Small updates
X-Git-Url: http://git.uio.no/git/?a=commitdiff_plain;h=7c1a1f1d73cf0d0ee2b3b9e2e4f56086e75fd9fa;p=u%2Fmrichter%2FAliRoot.git

Small updates
---

diff --git a/PWG2/FORWARD/analysis/AliFMDAnaCalibEnergyDistribution.cxx b/PWG2/FORWARD/analysis/AliFMDAnaCalibEnergyDistribution.cxx
index 36c12d86f62..d2efaf1e885 100644
--- a/PWG2/FORWARD/analysis/AliFMDAnaCalibEnergyDistribution.cxx
+++ b/PWG2/FORWARD/analysis/AliFMDAnaCalibEnergyDistribution.cxx
@@ -6,6 +6,7 @@
 #include <AliLog.h>
 #include <iostream>
 #include "TH2F.h"
+#include <TBrowser.h>
 #include "AliFMDAnaParameters.h"
 ClassImp(AliFMDAnaCalibEnergyDistribution)
 #if 0  
@@ -21,7 +22,8 @@ AliFMDAnaCalibEnergyDistribution::AliFMDAnaCalibEnergyDistribution()
   fIsInit(kFALSE),
   fNetaBins(0),
   fEtaMax(0),
-  fEtaMin(0){
+  fEtaMin(0)
+{
   
   
 }
@@ -32,13 +34,18 @@ void AliFMDAnaCalibEnergyDistribution::Init()
     AliFatal("Set Eta bins before doing Init or anything else");
   
   fArray.SetOwner();
+  fArray.SetName("etaBins");
   fEmptyArray.SetOwner();
-  
+  fEmptyArray.SetName("empty");
+  fRingArray.SetName("rings");
+
   for(Int_t i = 0; i<fNetaBins; i++) {
     TObjArray* etaArray = new TObjArray();
+    etaArray->SetName(Form("etabin_%03d", i+1));
     fArray.AddAtAndExpand(etaArray,i);
     for(Int_t det = 1; det<=3;det++) {
       TObjArray* detArray = new TObjArray();
+      detArray->SetName(Form("FMD%d", det));
       etaArray->AddAtAndExpand(detArray,det);
     }
   }
@@ -47,11 +54,13 @@ void AliFMDAnaCalibEnergyDistribution::Init()
   
   for(Int_t det = 1; det<=3;det++) {
     TObjArray* detArray = new TObjArray();
+    detArray->SetName(Form("FMD%d", det));
     fEmptyArray.AddAtAndExpand(detArray,det);
   }
     
   for(Int_t det = 1; det<=3;det++) {
     TObjArray* detArray = new TObjArray();
+    detArray->SetName(Form("FMD%d", det));
     fRingArray.AddAtAndExpand(detArray,det);
   }
     
@@ -160,6 +169,33 @@ void AliFMDAnaCalibEnergyDistribution::SetRingEnergyDistribution(Int_t  det,
   
   detArray->AddAtAndExpand(edist,ringNumber);
 }
+//____________________________________________________________________
+void AliFMDAnaCalibEnergyDistribution::Browse(TBrowser* b)
+{
+  for(Int_t i = 0; i<fNetaBins; i++) {
+    TObjArray* etaArray = static_cast<TObjArray*>(fArray.At(i));
+    etaArray->SetName(Form("etabin_%03d", i+1));
+    for(Int_t det = 1; det<=3;det++) {
+      TObjArray* detArray = static_cast<TObjArray*>(etaArray->At(det));
+      detArray->SetName(Form("FMD%d", det));
+    }
+  }
+  
+  for(Int_t det = 1; det<=3;det++) {
+    TObjArray* detArray = static_cast<TObjArray*>(fEmptyArray.At(det));
+    detArray->SetName(Form("FMD%d", det));
+  }
+    
+  for(Int_t det = 1; det<=3;det++) {
+    TObjArray* detArray = static_cast<TObjArray*>(fRingArray.At(det));
+    detArray->SetName(Form("FMD%d", det));
+  }
+
+  b->Add(&fArray,     "etabins");
+  b->Add(&fEmptyArray,"empty");
+  b->Add(&fRingArray, "rings");
+}
+
 //____________________________________________________________________
 //
 // EOF
diff --git a/PWG2/FORWARD/analysis/AliFMDAnaCalibEnergyDistribution.h b/PWG2/FORWARD/analysis/AliFMDAnaCalibEnergyDistribution.h
index f90e6f4488d..f1a88687bec 100644
--- a/PWG2/FORWARD/analysis/AliFMDAnaCalibEnergyDistribution.h
+++ b/PWG2/FORWARD/analysis/AliFMDAnaCalibEnergyDistribution.h
@@ -4,6 +4,7 @@
 #include <TObject.h>
 #include <TObjArray.h>
 #include <TH1F.h>
+class TBrowser;
 
 /**
  * @ingroup FMD_ana
@@ -28,6 +29,8 @@ class AliFMDAnaCalibEnergyDistribution : public TObject
   TH1F* GetEmptyEnergyDistribution(Int_t det, Char_t ring);
   void  SetRingEnergyDistribution(Int_t det, Char_t ring, TH1F* edist);
   TH1F* GetRingEnergyDistribution(Int_t det, Char_t ring);
+  Bool_t IsFolder() const { return kTRUE; }
+  void Browse(TBrowser* b);
  protected:
   void      Init();
   TObjArray fArray;
diff --git a/PWG2/FORWARD/analysis/AliFMDDndeta.cxx b/PWG2/FORWARD/analysis/AliFMDDndeta.cxx
index b58b82d43ae..3d7449faf0f 100644
--- a/PWG2/FORWARD/analysis/AliFMDDndeta.cxx
+++ b/PWG2/FORWARD/analysis/AliFMDDndeta.cxx
@@ -1,4 +1,8 @@
-
+// Code to analyse dN/deta from the forward analysis
+// This can plot the results 
+// Also works for MC data 
+//
+// -- Author: Hans Hjersing Dalsgaard <canute@gmail.com>
 #include "AliFMDDndeta.h"
 #include "TFile.h"
 #include "AliLog.h"
@@ -559,50 +563,50 @@ void AliFMDDndeta::DrawDndeta(Analysis what, Int_t rebin, Bool_t realdata, TStri
   
   // INEL
   
-  TGraphAsymmErrors* p7742_d1x1y1 = 0;
-  double p7742_d1x1y1_xval[] = { -1.3, -1.1, -0.9, -0.7, -0.5, -0.3, -0.1, 0.1, 0.3, 
+  TGraphAsymmErrors* p7742D1x1y1 = 0;
+  double p7742D1x1y1xval[] = { -1.3, -1.1, -0.9, -0.7, -0.5, -0.3, -0.1, 0.1, 0.3, 
     0.5, 0.7, 0.9, 1.1, 1.3 };
-  double p7742_d1x1y1_xerrminus[] = { 0.09999999999999987, 0.09999999999999987, 0.09999999999999998, 0.10000000000000009, 0.09999999999999998, 0.10000000000000003, 0.1, 0.1, 0.09999999999999998, 
+  double p7742D1x1y1xerrminus[] = { 0.09999999999999987, 0.09999999999999987, 0.09999999999999998, 0.10000000000000009, 0.09999999999999998, 0.10000000000000003, 0.1, 0.1, 0.09999999999999998, 
     0.09999999999999998, 0.09999999999999998, 0.09999999999999998, 0.10000000000000009, 0.10000000000000009 };
-  double p7742_d1x1y1_xerrplus[] = { 0.10000000000000009, 0.10000000000000009, 0.09999999999999998, 0.09999999999999998, 0.09999999999999998, 0.09999999999999998, 0.1, 0.1, 0.10000000000000003, 
+  double p7742D1x1y1xerrplus[] = { 0.10000000000000009, 0.10000000000000009, 0.09999999999999998, 0.09999999999999998, 0.09999999999999998, 0.09999999999999998, 0.1, 0.1, 0.10000000000000003, 
     0.09999999999999998, 0.10000000000000009, 0.09999999999999998, 0.09999999999999987, 0.09999999999999987 };
-  double p7742_d1x1y1_yval[] = { 3.28, 3.28, 3.22, 3.12, 3.06, 3.02, 2.98, 3.02, 3.02, 
+  double p7742D1x1y1yval[] = { 3.28, 3.28, 3.22, 3.12, 3.06, 3.02, 2.98, 3.02, 3.02, 
     3.05, 3.15, 3.21, 3.26, 3.33 };
-  double p7742_d1x1y1_yerrminus[] = { 0.06324555320336758, 0.06324555320336758, 0.06324555320336758, 0.06324555320336758, 0.06324555320336758, 0.05385164807134505, 0.05385164807134505, 0.05385164807134505, 0.05385164807134505, 
+  double p7742D1x1y1yerrminus[] = { 0.06324555320336758, 0.06324555320336758, 0.06324555320336758, 0.06324555320336758, 0.06324555320336758, 0.05385164807134505, 0.05385164807134505, 0.05385164807134505, 0.05385164807134505, 
     0.06324555320336758, 0.06324555320336758, 0.06324555320336758, 0.06324555320336758, 0.06324555320336758 };
-  double p7742_d1x1y1_yerrplus[] = { 0.08246211251235322, 0.08246211251235322, 0.08246211251235322, 0.08246211251235322, 0.08246211251235322, 0.08246211251235322, 0.07280109889280519, 0.08246211251235322, 0.08246211251235322, 
+  double p7742D1x1y1yerrplus[] = { 0.08246211251235322, 0.08246211251235322, 0.08246211251235322, 0.08246211251235322, 0.08246211251235322, 0.08246211251235322, 0.07280109889280519, 0.08246211251235322, 0.08246211251235322, 
     0.08246211251235322, 0.08246211251235322, 0.08246211251235322, 0.08246211251235322, 0.08246211251235322 };
-  int p7742_d1x1y1_numpoints = 14;
-  p7742_d1x1y1 = new TGraphAsymmErrors(p7742_d1x1y1_numpoints, p7742_d1x1y1_xval, p7742_d1x1y1_yval, p7742_d1x1y1_xerrminus, p7742_d1x1y1_xerrplus, p7742_d1x1y1_yerrminus, p7742_d1x1y1_yerrplus);
-  p7742_d1x1y1->SetName("/HepData/7742/d1x1y1");
-  p7742_d1x1y1->SetTitle("/HepData/7742/d1x1y1");
-  p7742_d1x1y1->SetMarkerStyle(21);
-  p7742_d1x1y1->SetMarkerColor(kRed);
-  // p7742_d1x1y1->Draw("Psame");
+  int p7742D1x1y1numpoints = 14;
+  p7742D1x1y1 = new TGraphAsymmErrors(p7742D1x1y1numpoints, p7742D1x1y1xval, p7742D1x1y1yval, p7742D1x1y1xerrminus, p7742D1x1y1xerrplus, p7742D1x1y1yerrminus, p7742D1x1y1yerrplus);
+  p7742D1x1y1->SetName("/HepData/7742/d1x1y1");
+  p7742D1x1y1->SetTitle("/HepData/7742/d1x1y1");
+  p7742D1x1y1->SetMarkerStyle(21);
+  p7742D1x1y1->SetMarkerColor(kRed);
+  // p7742D1x1y1->Draw("Psame");
   
   
   //NSD
-  TGraphAsymmErrors*  p7742_d2x1y1 = 0;
- double p7742_d2x1y1_xval[] = { -1.3, -1.1, -0.9, -0.7, -0.5, -0.3, -0.1, 0.1, 0.3, 
+  TGraphAsymmErrors*  p7742D2x1y1 = 0;
+ double p7742D2x1y1xval[] = { -1.3, -1.1, -0.9, -0.7, -0.5, -0.3, -0.1, 0.1, 0.3, 
     0.5, 0.7, 0.9, 1.1, 1.3 };
-  double p7742_d2x1y1_xerrminus[] = { 0.09999999999999987, 0.09999999999999987, 0.09999999999999998, 0.10000000000000009, 0.09999999999999998, 0.10000000000000003, 0.1, 0.1, 0.09999999999999998, 
+  double p7742D2x1y1xerrminus[] = { 0.09999999999999987, 0.09999999999999987, 0.09999999999999998, 0.10000000000000009, 0.09999999999999998, 0.10000000000000003, 0.1, 0.1, 0.09999999999999998, 
     0.09999999999999998, 0.09999999999999998, 0.09999999999999998, 0.10000000000000009, 0.10000000000000009 };
-  double p7742_d2x1y1_xerrplus[] = { 0.10000000000000009, 0.10000000000000009, 0.09999999999999998, 0.09999999999999998, 0.09999999999999998, 0.09999999999999998, 0.1, 0.1, 0.10000000000000003, 
+  double p7742D2x1y1xerrplus[] = { 0.10000000000000009, 0.10000000000000009, 0.09999999999999998, 0.09999999999999998, 0.09999999999999998, 0.09999999999999998, 0.1, 0.1, 0.10000000000000003, 
     0.09999999999999998, 0.10000000000000009, 0.09999999999999998, 0.09999999999999987, 0.09999999999999987 };
-  double p7742_d2x1y1_yval[] = { 3.9, 3.89, 3.81, 3.7, 3.64, 3.59, 3.53, 3.58, 3.59, 
+  double p7742D2x1y1yval[] = { 3.9, 3.89, 3.81, 3.7, 3.64, 3.59, 3.53, 3.58, 3.59, 
     3.61, 3.74, 3.8, 3.87, 3.95 };
-  double p7742_d2x1y1_yerrminus[] = { 0.13341664064126335, 0.13152946437965907, 0.13152946437965907, 0.1216552506059644, 0.1216552506059644, 0.1216552506059644, 0.1216552506059644, 0.1216552506059644, 0.1216552506059644, 
+  double p7742D2x1y1yerrminus[] = { 0.13341664064126335, 0.13152946437965907, 0.13152946437965907, 0.1216552506059644, 0.1216552506059644, 0.1216552506059644, 0.1216552506059644, 0.1216552506059644, 0.1216552506059644, 
     0.1216552506059644, 0.1216552506059644, 0.13152946437965907, 0.13152946437965907, 0.13341664064126335 };
-  double p7742_d2x1y1_yerrplus[] = { 0.13341664064126335, 0.13152946437965907, 0.13152946437965907, 0.1216552506059644, 0.1216552506059644, 0.1216552506059644, 0.1216552506059644, 0.1216552506059644, 0.1216552506059644, 
+  double p7742D2x1y1yerrplus[] = { 0.13341664064126335, 0.13152946437965907, 0.13152946437965907, 0.1216552506059644, 0.1216552506059644, 0.1216552506059644, 0.1216552506059644, 0.1216552506059644, 0.1216552506059644, 
     0.1216552506059644, 0.1216552506059644, 0.13152946437965907, 0.13152946437965907, 0.13341664064126335 };
-  int p7742_d2x1y1_numpoints = 14;
+  int p7742D2x1y1numpoints = 14;
 
-  p7742_d2x1y1 = new TGraphAsymmErrors(p7742_d2x1y1_numpoints, p7742_d2x1y1_xval, p7742_d2x1y1_yval, p7742_d2x1y1_xerrminus, p7742_d2x1y1_xerrplus, p7742_d2x1y1_yerrminus, p7742_d2x1y1_yerrplus);
-  p7742_d2x1y1->SetName("/HepData/7742/d2x1y1");
-  p7742_d2x1y1->SetTitle("/HepData/7742/d2x1y1");
-  p7742_d2x1y1->SetMarkerStyle(21);
-  p7742_d2x1y1->SetMarkerColor(kRed);
-  //p7742_d2x1y1.Draw("AP");
+  p7742D2x1y1 = new TGraphAsymmErrors(p7742D2x1y1numpoints, p7742D2x1y1xval, p7742D2x1y1yval, p7742D2x1y1xerrminus, p7742D2x1y1xerrplus, p7742D2x1y1yerrminus, p7742D2x1y1yerrplus);
+  p7742D2x1y1->SetName("/HepData/7742/d2x1y1");
+  p7742D2x1y1->SetTitle("/HepData/7742/d2x1y1");
+  p7742D2x1y1->SetMarkerStyle(21);
+  p7742D2x1y1->SetMarkerColor(kRed);
+  //p7742D2x1y1.Draw("AP");
 
 
 
@@ -613,19 +617,19 @@ void AliFMDDndeta::DrawDndeta(Analysis what, Int_t rebin, Bool_t realdata, TStri
   
   // CMS published NSD data
   
-  TGraphAsymmErrors* p7743_d8x1y1 = 0;
-  double p7743_d8x1y1_xval[] = { -2.25, -1.75, -1.25, -0.75, -0.25, 0.25, 0.75, 1.25, 1.75, 
+  TGraphAsymmErrors* p7743D8x1y1 = 0;
+  double p7743D8x1y1xval[] = { -2.25, -1.75, -1.25, -0.75, -0.25, 0.25, 0.75, 1.25, 1.75, 
     2.25 };
-  double p7743_d8x1y1_xerrminus[] = { 0.25, 0.25, 0.25, 0.25, 0.25, 0.25, 0.25, 0.25, 0.25, 0.25 };
-  double p7743_d8x1y1_xerrplus[] = { 0.25, 0.25, 0.25, 0.25, 0.25, 0.25, 0.25, 0.25, 0.25, 0.25 };
-  double p7743_d8x1y1_yval[] = { 3.6, 3.73, 3.62, 3.54, 3.48, 3.48, 3.54, 3.62, 3.73,  3.6 };
-  double p7743_d8x1y1_yerrminus[] = { 0.13, 0.14, 0.13, 0.13, 0.13, 0.13, 0.13, 0.13, 0.14,0.13 };
-  double p7743_d8x1y1_yerrplus[] = { 0.13, 0.14, 0.13, 0.13, 0.13, 0.13, 0.13, 0.13, 0.14, 0.13 };
-  int p7743_d8x1y1_numpoints = 10;
-  p7743_d8x1y1 = new TGraphAsymmErrors(p7743_d8x1y1_numpoints, p7743_d8x1y1_xval, p7743_d8x1y1_yval, p7743_d8x1y1_xerrminus, p7743_d8x1y1_xerrplus, p7743_d8x1y1_yerrminus, p7743_d8x1y1_yerrplus);
+  double p7743D8x1y1xerrminus[] = { 0.25, 0.25, 0.25, 0.25, 0.25, 0.25, 0.25, 0.25, 0.25, 0.25 };
+  double p7743D8x1y1xerrplus[] = { 0.25, 0.25, 0.25, 0.25, 0.25, 0.25, 0.25, 0.25, 0.25, 0.25 };
+  double p7743D8x1y1yval[] = { 3.6, 3.73, 3.62, 3.54, 3.48, 3.48, 3.54, 3.62, 3.73,  3.6 };
+  double p7743D8x1y1yerrminus[] = { 0.13, 0.14, 0.13, 0.13, 0.13, 0.13, 0.13, 0.13, 0.14,0.13 };
+  double p7743D8x1y1yerrplus[] = { 0.13, 0.14, 0.13, 0.13, 0.13, 0.13, 0.13, 0.13, 0.14, 0.13 };
+  int p7743D8x1y1numpoints = 10;
+  p7743D8x1y1 = new TGraphAsymmErrors(p7743D8x1y1numpoints, p7743D8x1y1xval, p7743D8x1y1yval, p7743D8x1y1xerrminus, p7743D8x1y1xerrplus, p7743D8x1y1yerrminus, p7743D8x1y1yerrplus);
 
-  p7743_d8x1y1->SetMarkerStyle(20);
-  p7743_d8x1y1->SetMarkerColor(kBlack);
+  p7743D8x1y1->SetMarkerStyle(20);
+  p7743D8x1y1->SetMarkerColor(kBlack);
   
   //End CMS
   
@@ -1151,13 +1155,13 @@ void AliFMDDndeta::DrawDndeta(Analysis what, Int_t rebin, Bool_t realdata, TStri
       if(what != kMultNSD) {
 	graphinel->Draw("PEsame");
 	graphinel2->Draw("PEsame");
-	p7742_d1x1y1->Draw("PEsame");
+	p7742D1x1y1->Draw("PEsame");
       }
       else{
 	graph->Draw("PEsame");
 	graph2->Draw("PEsame");
-	p7742_d2x1y1->Draw("PEsame");
-	p7743_d8x1y1->Draw("PEsame");
+	p7742D2x1y1->Draw("PEsame");
+	p7743D8x1y1->Draw("PEsame");
 
       }
 	
@@ -1208,10 +1212,10 @@ void AliFMDDndeta::DrawDndeta(Analysis what, Int_t rebin, Bool_t realdata, TStri
     //leg->AddEntry(hPythiaMB,"Pythia MB","l");
   leg->AddEntry(hSPDcombi,"HHD SPD clusters","p");
   if(what == kMult)
-    leg->AddEntry(p7742_d1x1y1,"ALICE INEL published","p");
+    leg->AddEntry(p7742D1x1y1,"ALICE INEL published","p");
   if(what == kMultNSD) {
-    leg->AddEntry(p7742_d2x1y1,"ALICE NSD published","p");
-    leg->AddEntry(p7743_d8x1y1, "CMS NSD published","p");
+    leg->AddEntry(p7742D2x1y1,"ALICE NSD published","p");
+    leg->AddEntry(p7743D8x1y1, "CMS NSD published","p");
   }
   }
   leg->Draw();
@@ -1353,10 +1357,10 @@ void AliFMDDndeta::DrawDndeta(Analysis what, Int_t rebin, Bool_t realdata, TStri
   //hTestdNdeta->DrawCopy("same");
   //hSPDcombi->DrawCopy("same");
   if(what == kMult)
-    p7742_d1x1y1->Draw("PEsame");
+    p7742D1x1y1->Draw("PEsame");
   if(what == kMultNSD) {
-    p7742_d2x1y1->Draw("PEsame");
-    p7743_d8x1y1->Draw("PEsame");
+    p7742D2x1y1->Draw("PEsame");
+    p7743D8x1y1->Draw("PEsame");
   }
 
   TLegend* leg2 = new TLegend(0.3,0.2,0.7,0.45,"");
@@ -1386,10 +1390,10 @@ void AliFMDDndeta::DrawDndeta(Analysis what, Int_t rebin, Bool_t realdata, TStri
     //leg2->AddEntry(hPythiaMB,"Pythia MB","l");
     //leg2->AddEntry(hSPDcombi,"HHD SPD clusters","p");
   if(what == kMult)
-    leg2->AddEntry(p7742_d1x1y1,"ALICE INEL published","p");
+    leg2->AddEntry(p7742D1x1y1,"ALICE INEL published","p");
   if(what == kMultNSD) {
-    leg2->AddEntry(p7742_d2x1y1,"ALICE NSD published","p");
-    leg2->AddEntry(p7743_d8x1y1,"CMS NSD published","p");
+    leg2->AddEntry(p7742D2x1y1,"ALICE NSD published","p");
+    leg2->AddEntry(p7743D8x1y1,"CMS NSD published","p");
   }
   }
   leg2->Draw();
diff --git a/PWG2/FORWARD/analysis/AliFMDDndeta.h b/PWG2/FORWARD/analysis/AliFMDDndeta.h
index ba2f1dcec29..a0a2ddd783d 100644
--- a/PWG2/FORWARD/analysis/AliFMDDndeta.h
+++ b/PWG2/FORWARD/analysis/AliFMDDndeta.h
@@ -1,10 +1,13 @@
-// -*- mode: C++ -*- 
+// Code to analyse dN/deta from the forward analysis
+// This can plot the results 
+// Also works for MC data 
 #ifndef ALIFMDDNDETA_H
 #define ALIFMDDNDETA_H
 
 #include "TObject.h"
-#include "TList.h"
+// #include "TList.h"
 #include "TString.h"
+class TList;
 class TH1F;
 class TH3F;
 class TProfile3D;
@@ -128,7 +131,7 @@ class AliFMDDndeta : public TObject
    * 
    * @return 
    */
-  TList* GetMultList(Analysis what) {return fMultList[what];}
+  TList* GetMultList(Analysis what) const {return fMultList[what];}
  private:
   void GenerateHits(Analysis what);
   void SetNames(Analysis what);
@@ -159,4 +162,4 @@ class AliFMDDndeta : public TObject
 #endif
 // Local Variables:
 //  mode: C++
-// End Variables;
+// End:
diff --git a/PWG2/FORWARD/analysis2/AddTaskFMD.C b/PWG2/FORWARD/analysis2/AddTaskFMD.C
index 74cf04608ac..8ce22df078b 100644
--- a/PWG2/FORWARD/analysis2/AddTaskFMD.C
+++ b/PWG2/FORWARD/analysis2/AddTaskFMD.C
@@ -1,7 +1,17 @@
+/** 
+ * @defgroup pwg2_forward_scripts Scripts used in the analysis
+ *
+ * @ingroup pwg2_forward
+ */
+/**
+ * @file 
+ * @ingroup pwg2_forward_scripts
+ * 
+ */
 /**
  * This is the macro to include the Forward multiplicity in a train.  
  * 
- * @ingroup pwg2_forward_analysis_scripts
+ * @ingroup pwg2_forward_scripts
  */
 AliAnalysisTask*
 AddTaskFMD()
diff --git a/PWG2/FORWARD/analysis2/AliAODForwardMult.h b/PWG2/FORWARD/analysis2/AliAODForwardMult.h
index 6aadbb19ac6..b484097d240 100644
--- a/PWG2/FORWARD/analysis2/AliAODForwardMult.h
+++ b/PWG2/FORWARD/analysis2/AliAODForwardMult.h
@@ -82,7 +82,7 @@ class TBrowser;
  * The histogram can be used as input for other kinds of analysis too, 
  * like flow, event-plane, centrality, and so on. 
  *
- * @ingroup pwg2_forward_analysis 
+ * @ingroup pwg2_forward 
  */
 class AliAODForwardMult : public TObject
 {
diff --git a/PWG2/FORWARD/analysis2/AliFMDCorrELossFit.h b/PWG2/FORWARD/analysis2/AliFMDCorrELossFit.h
index 38933eebf88..4da19de6ea8 100644
--- a/PWG2/FORWARD/analysis2/AliFMDCorrELossFit.h
+++ b/PWG2/FORWARD/analysis2/AliFMDCorrELossFit.h
@@ -6,6 +6,11 @@
 class TF1;
 class TBrowser;
 
+/** 
+ * @defgroup pwg2_forward_corr Corrections 
+ * 
+ * @ingroup pwg2_forward
+ */
 /** 
  * Object holding the Energy loss fit 'correction'
  * 
@@ -19,6 +24,7 @@ public:
   /** 
    * POD structure to hold data from fits 
    * 
+   * @ingroup pwg2_forward_corr
    */
   struct ELossFit : public TObject 
   {
@@ -60,24 +66,24 @@ public:
     /** 
      * Constructor with full parameter set
      * 
-     * @param d         Detector number
-     * @param r         Ring identifier 
      * @param quality   Quality flag
      * @param n         @f$ N@f$ - Number of fitted peaks
      * @param chi2      @f$ \chi^2 @f$
      * @param nu        @f$ \nu @f$ - number degrees of freedom
-     * @param c         @f$ C2f$ - scale constant
+     * @param c         @f$ C@f$ - scale constant
      * @param ec        @f$ \delta C@f$ - error on @f$ C@f$ 
-     * @param delta     @f$ \Delta2f$ - scale constant		  
+     * @param delta     @f$ \Delta@f$ - Most probable value		  
      * @param edelta    @f$ \delta\Delta@f$ - error on @f$\Delta@f$ 
-     * @param xi        @f$ \xi2f$ - scale constant		  
+     * @param xi        @f$ \xi@f$ - width  
      * @param exi       @f$ \delta\xi@f$ - error on @f$\xi@f$ 
-     * @param sigma     @f$ \sigma@f$ - scale constant		   
+     * @param sigma     @f$ \sigma@f$ - Width of Gaussian		   
      * @param esigma    @f$ \delta\sigma@f$ - error on @f$\sigma@f$ 
-     * @param sigman    @f$ \sigma_n@f$ - scale constant		  
+     * @param sigman    @f$ \sigma_n@f$ - Noise width		  
      * @param esigman   @f$ \delta\sigma_n@f$ - error on @f$\sigma_n@f$ 
      * @param a         Array of @f$ N-1@f$ weights @f$ a_i@f$ for 
      *                  @f$ i=2,\ldots@f$ 
+     * @param ea        Array of @f$ N-1@f$ error on the weights @f$ a_i@f$ for 
+     *                  @f$ i=2,\ldots@f$ 
      */
     ELossFit(Int_t     quality,UShort_t  n, 
 	     Double_t  chi2,   UShort_t  nu, 
@@ -371,10 +377,10 @@ public:
   /** 
    * Set the fit parameters from a function 
    * 
-   * @param d    Detector
-   * @param r    Ring 
-   * @param eta  Eta (bin number, 1->nBins)
-   * @param f    ELoss fit result - note, the object will take ownership
+   * @param d       Detector
+   * @param r       Ring 
+   * @param etaBin  Eta (bin number, 1->nBins)
+   * @param f       ELoss fit result - note, the object will take ownership
    */  
   Bool_t SetFit(UShort_t d, Char_t r, Int_t etaBin, ELossFit* f);
   /** 
@@ -382,22 +388,25 @@ public:
    * 
    * @param d         Detector number
    * @param r         Ring identifier 
+   * @param eta       Eta value
    * @param quality   Quality flag
    * @param n         @f$ N@f$ - Number of fitted peaks
    * @param chi2      @f$ \chi^2 @f$
    * @param nu        @f$ \nu @f$ - number degrees of freedom
-   * @param c         @f$ C2f$ - scale constant
+   * @param c         @f$ C@f$ - scale constant
    * @param ec        @f$ \delta C@f$ - error on @f$ C@f$ 
-   * @param delta     @f$ \Delta2f$ - scale constant		  
+   * @param delta     @f$ \Delta@f$ - most probable value
    * @param edelta    @f$ \delta\Delta@f$ - error on @f$\Delta@f$ 
-   * @param xi        @f$ \xi2f$ - scale constant		  
+   * @param xi        @f$ \xi@f$ - Landau width		  
    * @param exi       @f$ \delta\xi@f$ - error on @f$\xi@f$ 
-   * @param sigma     @f$ \sigma@f$ - scale constant		   
+   * @param sigma     @f$ \sigma@f$ - Gaussian width
    * @param esigma    @f$ \delta\sigma@f$ - error on @f$\sigma@f$ 
-   * @param sigman    @f$ \sigma_n@f$ - scale constant		  
+   * @param sigman    @f$ \sigma_n@f$ - Noise width		  
    * @param esigman   @f$ \delta\sigma_n@f$ - error on @f$\sigma_n@f$ 
    * @param a         Array of @f$ N-1@f$ weights @f$ a_i@f$ for 
    *                  @f$ i=2,\ldots@f$ 
+   * @param ea        Array of @f$ N-1@f$ errors on weights @f$ a_i@f$ for 
+   *                  @f$ i=2,\ldots@f$ 
    */
   Bool_t SetFit(UShort_t  d,      Char_t    r, Double_t eta, 
 		Int_t     quality,UShort_t  n, 
@@ -423,7 +432,9 @@ public:
   /** 
    * Set the eta axis to use 
    * 
-   * @param axis Eta axis 
+   * @param nBins Number of bins 
+   * @param min   Minimum @f$ \eta@f$
+   * @param max   maximum @f$ \eta@f$
    */
   void SetEtaAxis(Int_t nBins, Double_t min, Double_t max);
   /** 
diff --git a/PWG2/FORWARD/analysis2/AliFMDCorrMergingEfficiency.h b/PWG2/FORWARD/analysis2/AliFMDCorrMergingEfficiency.h
index 470c57403d7..797b1e02104 100644
--- a/PWG2/FORWARD/analysis2/AliFMDCorrMergingEfficiency.h
+++ b/PWG2/FORWARD/analysis2/AliFMDCorrMergingEfficiency.h
@@ -118,7 +118,9 @@ public:
   /** 
    * Set the vertex axis to use 
    * 
-   * @param axis Vertex axis 
+   * @param nBins   Number of bins
+   * @param min     Minimum
+   * @param max     Maximum
    */
   void SetVertexAxis(Int_t nBins, Double_t min, Double_t max);
   /* @} */
@@ -152,7 +154,7 @@ protected:
    * 
    * @param vertex The interaction points @f$z@f$-coordinate 
    * 
-   * @return Vertex bin in @f$[1,N_{\box{vertex}}]@f$ or negative if 
+   * @return Vertex bin in @f$[1,N_{\mbox{vertex}}]@f$ or negative if 
    * out of range 
    */
   Int_t FindVertexBin(Double_t vertex) const;
diff --git a/PWG2/FORWARD/analysis2/AliFMDCorrSecondaryMap.h b/PWG2/FORWARD/analysis2/AliFMDCorrSecondaryMap.h
index 1c7a43097f2..1d01470c8a8 100644
--- a/PWG2/FORWARD/analysis2/AliFMDCorrSecondaryMap.h
+++ b/PWG2/FORWARD/analysis2/AliFMDCorrSecondaryMap.h
@@ -132,8 +132,10 @@ public:
   /** 
    * Set the vertex axis to use 
    * 
-   * @param axis Vertex axis 
-   */
+   * @param nBins Number of bins
+   * @param min   Minimum	  
+   * @param max   Maximum	  
+   */  
   void SetVertexAxis(Int_t nBins, Double_t min, Double_t max);
   /** 
    * Set the eta axis to use 
@@ -144,7 +146,9 @@ public:
   /** 
    * Set the eta axis to use 
    * 
-   * @param axis Eta axis 
+   * @param nBins Number of bins
+   * @param min   Minimum	  
+   * @param max   Maximum	  
    */
   void SetEtaAxis(Int_t nBins, Double_t min, Double_t max);
   /* @} */
@@ -178,7 +182,7 @@ protected:
    * 
    * @param vertex The interaction points @f$z@f$-coordinate 
    * 
-   * @return Vertex bin in @f$[1,N_{\box{vertex}}]@f$ or negative if 
+   * @return Vertex bin in @f$[1,N_{\mbox{vertex}}]@f$ or negative if 
    * out of range 
    */
   Int_t FindVertexBin(Double_t vertex) const;
diff --git a/PWG2/FORWARD/analysis2/AliFMDCorrVertexBias.h b/PWG2/FORWARD/analysis2/AliFMDCorrVertexBias.h
index 570dad47721..244478e9987 100644
--- a/PWG2/FORWARD/analysis2/AliFMDCorrVertexBias.h
+++ b/PWG2/FORWARD/analysis2/AliFMDCorrVertexBias.h
@@ -125,7 +125,9 @@ public:
   /** 
    * Set the vertex axis to use 
    * 
-   * @param axis Vertex axis 
+   * @param nBins Number of bins
+   * @param min   Minimum	  
+   * @param max   Maximum	  
    */
   void SetVertexAxis(Int_t nBins, Double_t min, Double_t max);
   /* @} */
@@ -159,7 +161,7 @@ protected:
    * 
    * @param vertex The interaction points @f$z@f$-coordinate 
    * 
-   * @return Vertex bin in @f$[1,N_{\box{vertex}}]@f$ or negative if 
+   * @return Vertex bin in @f$[1,N_{\mbox{vertex}}]@f$ or negative if 
    * out of range 
    */
   Int_t FindVertexBin(Double_t vertex) const;
diff --git a/PWG2/FORWARD/analysis2/AliFMDCorrections.h b/PWG2/FORWARD/analysis2/AliFMDCorrections.h
index 26b8de94410..6c3b2deccb0 100644
--- a/PWG2/FORWARD/analysis2/AliFMDCorrections.h
+++ b/PWG2/FORWARD/analysis2/AliFMDCorrections.h
@@ -22,7 +22,7 @@ class TH2D;
  *   - AliFMDAnaCalibEventSelectionEfficiency
  *   - AliFMDAnaCalibSharingEfficiency
  *
- * @ingroup pwg2_forward_analysis 
+ * @ingroup pwg2_forward 
  */
 class AliFMDCorrections : public TNamed
 {
diff --git a/PWG2/FORWARD/analysis2/AliFMDDensityCalculator.h b/PWG2/FORWARD/analysis2/AliFMDDensityCalculator.h
index 20a1cefde5a..f0806a044fd 100644
--- a/PWG2/FORWARD/analysis2/AliFMDDensityCalculator.h
+++ b/PWG2/FORWARD/analysis2/AliFMDDensityCalculator.h
@@ -24,7 +24,7 @@ class TProfile;
  *   - AliFMDDoubleHitCorrection 
  *   - AliFMDDeadCorrection 
  *
- * @ingroup pwg2_forward_analysis 
+ * @ingroup pwg2_forward 
  */
 class AliFMDDensityCalculator : public TNamed
 {
@@ -56,7 +56,7 @@ public:
    * 
    * @return Reference to this object
    */
-  AliFMDDensityCalculator& operator=(const AliFMDDensityCalculator&);
+  AliFMDDensityCalculator& operator=(const AliFMDDensityCalculator& o);
   /** 
    * Do the calculations 
    * 
diff --git a/PWG2/FORWARD/analysis2/AliFMDEnergyFitter.cxx b/PWG2/FORWARD/analysis2/AliFMDEnergyFitter.cxx
index 76575473ca8..c85ea56c2ca 100644
--- a/PWG2/FORWARD/analysis2/AliFMDEnergyFitter.cxx
+++ b/PWG2/FORWARD/analysis2/AliFMDEnergyFitter.cxx
@@ -150,7 +150,7 @@ void
 AliFMDEnergyFitter::Init(const TAxis& eAxis)
 {
   if (fEtaAxis.GetNbins() == 0 || 
-      fEtaAxis.GetXmin() == fEtaAxis.GetXmax()) 
+      TMath::Abs(fEtaAxis.GetXmax() - fEtaAxis.GetXmin()) < 1e-7) 
     SetEtaAxis(eAxis);
   TIter    next(&fRingHistos);
   RingHistos* o = 0;
@@ -209,7 +209,7 @@ AliFMDEnergyFitter::Accumulate(const AliESDFMD& input,
 
 //____________________________________________________________________
 void
-AliFMDEnergyFitter::Fit(TList* dir)
+AliFMDEnergyFitter::Fit(const TList* dir)
 {
   if (!fDoFits) return;
 
diff --git a/PWG2/FORWARD/analysis2/AliFMDEnergyFitter.h b/PWG2/FORWARD/analysis2/AliFMDEnergyFitter.h
index 18758eb645b..54136524523 100644
--- a/PWG2/FORWARD/analysis2/AliFMDEnergyFitter.h
+++ b/PWG2/FORWARD/analysis2/AliFMDEnergyFitter.h
@@ -1,5 +1,5 @@
-#ifndef ALIROOT_PWG2_FORWARD_ALIFMDENERGYFITTER_H
-#define ALIROOT_PWG2_FORWARD_ALIFMDENERGYFITTER_H
+#ifndef ALIFMDENERGYFITTER_H
+#define ALIFMDENERGYFITTER_H
 #include <TNamed.h>
 #include <TH1D.h>
 #include <TAxis.h>
@@ -27,7 +27,7 @@ class TArrayD;
  *    - None
  *
  *
- * @ingroup pwg2_forward_analysis 
+ * @ingroup pwg2_forward 
  */
 class AliFMDEnergyFitter : public TNamed
 {
@@ -153,8 +153,23 @@ public:
    * @param x Number of energy loss bins 
    */
   void SetNEbins(Int_t x) { fNEbins = x; }
+  /** 
+   * Set the maximum relative error 
+   * 
+   * @param e Maximum relative error 
+   */
   void SetMaxRelativeParameterError(Double_t e=0.2) { fMaxRelParError = e; }
+  /** 
+   * Set the maximum @f$ \chi^2/\nu@f$ 
+   * 
+   * @param c Maximum @f$ \chi^2/\nu@f$ 
+   */
   void SetMaxChi2PerNDF(Double_t c=10) { fMaxChi2PerNDF = c; }
+  /** 
+   * Set the least weight
+   * 
+   * @param c Least weight
+   */
   void SetMinWeight(Double_t c=1e-7) { fMinWeight = c; }
   /**
    * Set wheter to use increasing bin sizes 
@@ -177,7 +192,12 @@ public:
    * 
    * @param dir Where the histograms are  
    */
-  void Fit(TList* dir);
+  void Fit(const TList* dir);
+  /** 
+   * Generate the corrections object 
+   * 
+   * @param dir List to analyse 
+   */
   void MakeCorrectionsObject(TList* dir);
   
   /** 
@@ -286,7 +306,7 @@ protected:
 		   Double_t     relErrorCut, 
 		   Double_t     chi2nuCut) const;
     /** 
-     * Fit a signal histogram.  First, the bin @f% b_{min}@f$ with
+     * Fit a signal histogram.  First, the bin @f$ b_{min}@f$ with
      * maximum bin content in the range @f$ [E_{min},\infty]@f$ is
      * found.  Then the fit range is set to the bin range 
      * @f$ [b_{min}-\Delta b,b_{min}+2\Delta b]@f$, and a 1 
@@ -382,9 +402,12 @@ protected:
     /** 
      * Make E/E_mip histogram 
      * 
-     * @param ieta   Eta bin
-     * @param eMin   Least signal
-     * @param eMax   Largest signal 
+     * @param ieta    Eta bin
+     * @param eMin    Least signal
+     * @param eMax    Largest signal 
+     * @param deMax   Maximum energy loss 
+     * @param nDeBins Number energy loss bins 
+     * @param incr    Whether to make bins of increasing size
      */
     void Make(Int_t ieta, Double_t eMin, Double_t eMax, 
 	      Double_t deMax=12, Int_t nDeBins=300, Bool_t incr=true);
diff --git a/PWG2/FORWARD/analysis2/AliFMDEnergyFitterTask.h b/PWG2/FORWARD/analysis2/AliFMDEnergyFitterTask.h
index 6caef7d7f87..edc8cb6cf8c 100644
--- a/PWG2/FORWARD/analysis2/AliFMDEnergyFitterTask.h
+++ b/PWG2/FORWARD/analysis2/AliFMDEnergyFitterTask.h
@@ -12,16 +12,6 @@ class TList;
 class TTree;
 
 
-/** 
- * @mainpage ALICE PWG2 Forward Multiplcity Analysis 
- */
-/** 
- * @defgroup pwg2_forward_analysis PWG2 Forward analysis
- *
- * Code to do the multiplicity analysis in the forward psuedo-rapidity
- * regions
- *
- */
 /** 
  * Histogram and fit the energy loss distributions for the FMD
  * 
@@ -36,7 +26,7 @@ class TTree;
  * @par Corrections used 
  *   - None
  * 
- * @ingroup pwg2_forward_analysis 
+ * @ingroup pwg2_forward_tasks
  * 
  */
 class AliFMDEnergyFitterTask : public AliAnalysisTaskSE
diff --git a/PWG2/FORWARD/analysis2/AliFMDEventInspector.h b/PWG2/FORWARD/analysis2/AliFMDEventInspector.h
index 1dddd3ebe10..29075cbcdea 100644
--- a/PWG2/FORWARD/analysis2/AliFMDEventInspector.h
+++ b/PWG2/FORWARD/analysis2/AliFMDEventInspector.h
@@ -24,7 +24,7 @@ class TList;
  * @par Corrections used: 
  *   - None
  *
- * @ingroup pwg2_forward_analysis 
+ * @ingroup pwg2_forward 
  */
 class AliFMDEventInspector : public TNamed
 {
@@ -108,7 +108,6 @@ public:
    * Process the event 
    * 
    * @param event     Input event 
-   * @param first     True on first event
    * @param triggers  On return, the triggers fired 
    * @param lowFlux   On return, true if the event is considered a low-flux 
    *                  event (according to the setting of fLowFluxCut) 
diff --git a/PWG2/FORWARD/analysis2/AliFMDHistCollector.h b/PWG2/FORWARD/analysis2/AliFMDHistCollector.h
index 4dc7a24f2ff..50c228b5bff 100644
--- a/PWG2/FORWARD/analysis2/AliFMDHistCollector.h
+++ b/PWG2/FORWARD/analysis2/AliFMDHistCollector.h
@@ -21,7 +21,7 @@ class TH2D;
  * @par HistCollector used: 
  *   - AliFMDAnaCalibBackgroundCorrection
  *
- * @ingroup pwg2_forward_analysis 
+ * @ingroup pwg2_forward 
  */
 class AliFMDHistCollector : public TNamed
 {
diff --git a/PWG2/FORWARD/analysis2/AliFMDMCDensityCalculator.h b/PWG2/FORWARD/analysis2/AliFMDMCDensityCalculator.h
index cf506065e51..6f39f9bd2f2 100644
--- a/PWG2/FORWARD/analysis2/AliFMDMCDensityCalculator.h
+++ b/PWG2/FORWARD/analysis2/AliFMDMCDensityCalculator.h
@@ -20,7 +20,7 @@ class TH1D;
  * @par Corrections used: 
  *   - None
  *
- * @ingroup pwg2_forward_analysis 
+ * @ingroup pwg2_forward 
  */
 class AliFMDMCDensityCalculator : public AliFMDDensityCalculator
 {
@@ -56,7 +56,7 @@ public:
    * 
    * @return Reference to this object
    */
-  AliFMDMCDensityCalculator& operator=(const AliFMDMCDensityCalculator&);
+  AliFMDMCDensityCalculator& operator=(const AliFMDMCDensityCalculator& o);
   /** 
    * Do the calculations 
    * 
diff --git a/PWG2/FORWARD/analysis2/AliFMDSharingFilter.h b/PWG2/FORWARD/analysis2/AliFMDSharingFilter.h
index 7d8ba9922d0..bfdbc3e6c3f 100644
--- a/PWG2/FORWARD/analysis2/AliFMDSharingFilter.h
+++ b/PWG2/FORWARD/analysis2/AliFMDSharingFilter.h
@@ -31,7 +31,7 @@ class TH2;
  *      hit strips for each vertex bin (if enabled - see Init method)
  * 
  *
- * @ingroup pwg2_forward_analysis 
+ * @ingroup pwg2_forward 
  */
 class AliFMDSharingFilter : public TNamed
 {
diff --git a/PWG2/FORWARD/analysis2/AliForwardCorrectionManager.h b/PWG2/FORWARD/analysis2/AliForwardCorrectionManager.h
index 7df8838a758..6d99e34e25f 100644
--- a/PWG2/FORWARD/analysis2/AliForwardCorrectionManager.h
+++ b/PWG2/FORWARD/analysis2/AliForwardCorrectionManager.h
@@ -9,6 +9,11 @@
 #include <TString.h>
 class TFile;
 
+/**
+ * Manager (singleton) of corrections 
+ * 
+ * @ingroup pwg2_forward_corr 
+ */
 class AliForwardCorrectionManager : public TObject
 {
 public:
@@ -39,6 +44,7 @@ public:
    * @param collisionSystem Collision system
    * @param cmsNN           Center of mass energy per nuclean pair [GeV]
    * @param field           Magnetic field setting [kG]
+   * @param mc              Monte-carlo switch
    * @param what            What to read in. 
    * @param force           Force (re-)reading of specified things
    * 
diff --git a/PWG2/FORWARD/analysis2/AliForwardMCCorrectionsTask.h b/PWG2/FORWARD/analysis2/AliForwardMCCorrectionsTask.h
index a7dd04cc75a..b78da669eed 100644
--- a/PWG2/FORWARD/analysis2/AliForwardMCCorrectionsTask.h
+++ b/PWG2/FORWARD/analysis2/AliForwardMCCorrectionsTask.h
@@ -30,7 +30,7 @@ class TTree;
  *   
  * @par Corrections used 
  * 
- * @ingroup pwg2_forward_analysis 
+ * @ingroup pwg2_forward_tasks
  * 
  */
 class AliForwardMCCorrectionsTask : public AliAnalysisTaskSE
diff --git a/PWG2/FORWARD/analysis2/AliForwardMultiplicityTask.h b/PWG2/FORWARD/analysis2/AliForwardMultiplicityTask.h
index 3339b1f1b1e..97127b853a2 100644
--- a/PWG2/FORWARD/analysis2/AliForwardMultiplicityTask.h
+++ b/PWG2/FORWARD/analysis2/AliForwardMultiplicityTask.h
@@ -23,12 +23,20 @@ class TTree;
  * @mainpage ALICE PWG2 Forward Multiplcity Analysis 
  */
 /** 
- * @defgroup pwg2_forward_analysis PWG2 Forward analysis
+ * @defgroup pwg2_forward PWG2 Forward analysis
  *
  * Code to do the multiplicity analysis in the forward psuedo-rapidity
  * regions
  *
  */
+/** 
+ * @defgroup pwg2_forward_tasks Tasks
+ *
+ * Code to do the multiplicity analysis in the forward psuedo-rapidity
+ * regions
+ *
+ * @ingroup pwg2_forward 
+ */
 /** 
  * Calculate the multiplicity in the forward regions event-by-event 
  * 
@@ -42,7 +50,7 @@ class TTree;
  *   
  * @par Corrections used 
  * 
- * @ingroup pwg2_forward_analysis 
+ * @ingroup pwg2_forward_tasks
  * 
  */
 class AliForwardMultiplicityTask : public AliAnalysisTaskSE
diff --git a/PWG2/FORWARD/analysis2/AliForwardUtil.h b/PWG2/FORWARD/analysis2/AliForwardUtil.h
index 938678b42be..405057eb633 100644
--- a/PWG2/FORWARD/analysis2/AliForwardUtil.h
+++ b/PWG2/FORWARD/analysis2/AliForwardUtil.h
@@ -13,7 +13,7 @@ class AliESDEvent;
 /** 
  * Utilities used in the forward multiplcity analysis 
  * 
- * @ingroup pwg2_forward_analysis 
+ * @ingroup pwg2_forward 
  */
 class AliForwardUtil : public TObject
 {
@@ -21,7 +21,7 @@ public:
   //==================================================================
   /** 
    * @{ 
-   * @nane Collision/run parameters 
+   * @name Collision/run parameters 
    */
   /**						
    * Defined collision types 
@@ -69,8 +69,7 @@ public:
   /** 
    * Get a string representation of the center of mass energy per nuclean
    * 
-   * @param sys  Collision system 
-   * @param sNN  Center of mass energy per nucleon
+   * @param cms  Center of mass energy per nucleon
    * 
    * @return String representation of the center of mass energy per nuclean
    */
@@ -170,21 +169,21 @@ public:
    *    f_i(x;\Delta,\xi,\sigma') = f(x;\Delta_i,\xi_i,\sigma_i')
    * @f] 
    * corresponding to @f$ i@f$ particles i.e., with the substitutions 
-   * @f[ 
-   *    \Delta    \rightarrow \Delta_i    = i(\Delta + \xi\log(i))\\
-   *    \xi       \rightarrow \xi_i       = i \xi\\
-   *    \sigma    \rightarrow \sigma_i    = \sqrt{i}\sigma\\
-   *    \sigma'^2 \rightarrow \sigma_i'^2 = \sigma_n^2 + \sigma_i^2
-   * @f] 
+   * @f{eqnarray*}{ 
+   *    \Delta    \rightarrow \Delta_i    &=& i(\Delta + \xi\log(i))\\
+   *    \xi       \rightarrow \xi_i       &=& i \xi\\
+   *    \sigma    \rightarrow \sigma_i    &=& \sqrt{i}\sigma\\
+   *    \sigma'^2 \rightarrow \sigma_i'^2 &=& \sigma_n^2 + \sigma_i^2
+   * @f} 
    * 
    * @param x        Where to evaluate 
    * @param delta    @f$ \Delta@f$ 
    * @param xi       @f$ \xi@f$ 
    * @param sigma    @f$ \sigma@f$ 
    * @param sigma_n  @f$ \sigma_n@f$
-   * @param i        @f$ i@f$
+   * @param i        @f$ i @f$
    * 
-   * @return @f$ f_i@f$ evaluated
+   * @return @f$ f_i @f$ evaluated
    */  
   static Double_t ILandauGaus(Double_t x, Double_t delta, Double_t xi, 
 			      Double_t sigma, Double_t sigma_n, Int_t i);
@@ -215,7 +214,7 @@ public:
    * 
    * @param x        Where to evaluate 
    * @param ipar     Parameter number 
-   * @param dp       @f$ \esilon\delta p_i@f$ for some value of @f$\epsilon@f$
+   * @param dp       @f$ \epsilon\delta p_i@f$ for some value of @f$\epsilon@f$
    * @param delta    @f$ \Delta@f$ 
    * @param xi       @f$ \xi@f$ 
    * @param sigma    @f$ \sigma@f$ 
@@ -376,7 +375,7 @@ public:
   /** 
    * Structure to hold histograms 
    *
-   * @ingroup pwg2_forward_analysis 
+   * @ingroup pwg2_forward 
    */
   struct Histos : public TObject
   {	
diff --git a/PWG2/FORWARD/analysis2/DrawRes.C b/PWG2/FORWARD/analysis2/DrawRes.C
index 859711edd78..8d5924e7e1f 100644
--- a/PWG2/FORWARD/analysis2/DrawRes.C
+++ b/PWG2/FORWARD/analysis2/DrawRes.C
@@ -1,3 +1,8 @@
+/**
+ * @file 
+ * 
+ * @ingroup pwg2_forward_scripts
+ */
 #include <TH1D.h>
 #include <TH2D.h>
 #include <TCanvas.h>
@@ -33,7 +38,7 @@
  * 
  * See also the script Pass2.C 
  * 
- * @ingroup pwg2_forward_analysis_scripts
+ * @ingroup pwg2_forward_scripts
  */
 struct DrawRes 
 {
diff --git a/PWG2/FORWARD/analysis2/OtherData.C b/PWG2/FORWARD/analysis2/OtherData.C
index 55bcc4faa13..e495e9d53ea 100644
--- a/PWG2/FORWARD/analysis2/OtherData.C
+++ b/PWG2/FORWARD/analysis2/OtherData.C
@@ -1,3 +1,8 @@
+/**
+ * @file 
+ * 
+ * @ingroup pwg2_forward_scripts
+ */
 #include <TGraphAsymmErrors.h>
 #include <TMultiGraph.h>
 #include <TStyle.h>
@@ -7,15 +12,15 @@
 
 //____________________________________________________________________
 /**
- * @defgroup pwg2_forward_analysis_otherdata  External data 
+ * @defgroup pwg2_forward_otherdata  External data 
  *
- * @ingroup pwg2_forward_analysis_scripts
+ * @ingroup pwg2_forward_scripts
  */
 //____________________________________________________________________
 /**
  * Values used 
  * 
- * @ingroup pwg2_forward_analysis_otherdata 
+ * @ingroup pwg2_forward_otherdata 
  */
 enum { 
   /** Color used for UA5 data */
@@ -44,7 +49,7 @@ enum {
  * @param name     Name of graph 
  * @param title    Title of graph 
  * 
- * @ingroup pwg2_forward_analysis_otherdata
+ * @ingroup pwg2_forward_otherdata
  */
 void
 SetGraphAttributes(TGraph* g, Int_t marker, Int_t color,
@@ -71,7 +76,7 @@ SetGraphAttributes(TGraph* g, Int_t marker, Int_t color,
  * 
  * @return graph of data 
  * 
- * @ingroup pwg2_forward_analysis_otherdata
+ * @ingroup pwg2_forward_otherdata
  */
 TGraphAsymmErrors* UA5Nsd(Bool_t mirrored=false) 
 {
@@ -111,7 +116,7 @@ TGraphAsymmErrors* UA5Nsd(Bool_t mirrored=false)
  * 
  * @return graph of data 
  * 
- * @ingroup pwg2_forward_analysis_otherdata
+ * @ingroup pwg2_forward_otherdata
  */
 TGraphAsymmErrors* UA5Inel(Bool_t mirrored=false) 
 {
@@ -150,7 +155,7 @@ TGraphAsymmErrors* UA5Inel(Bool_t mirrored=false)
  *
  * @return graph of data 
  * 
- * @ingroup pwg2_forward_analysis_otherdata
+ * @ingroup pwg2_forward_otherdata
  */
 TGraphAsymmErrors* AliceCentralInel900()
 {  
@@ -199,7 +204,7 @@ TGraphAsymmErrors* AliceCentralInel900()
  *
  * @return graph of data 
  * 
- * @ingroup pwg2_forward_analysis_otherdata
+ * @ingroup pwg2_forward_otherdata
  */
 TGraphAsymmErrors* AliceCentralInelGt900()
 {  
@@ -245,7 +250,7 @@ TGraphAsymmErrors* AliceCentralInelGt900()
  *
  * @return graph of data 
  * 
- * @ingroup pwg2_forward_analysis_otherdata
+ * @ingroup pwg2_forward_otherdata
  */
 TGraphAsymmErrors* AliceCentralInelGt2360()
 {  
@@ -286,7 +291,7 @@ TGraphAsymmErrors* AliceCentralInelGt2360()
  *
  * @return graph of data 
  * 
- * @ingroup pwg2_forward_analysis_otherdata
+ * @ingroup pwg2_forward_otherdata
  */
 TGraphAsymmErrors* AliceCentralInelGt7000()
 {  
@@ -328,7 +333,7 @@ TGraphAsymmErrors* AliceCentralInelGt7000()
  *
  * @return graph of data 
  * 
- * @ingroup pwg2_forward_analysis_otherdata
+ * @ingroup pwg2_forward_otherdata
  */
 TGraphAsymmErrors* AliceCentralNsd900()
 {
@@ -377,7 +382,7 @@ TGraphAsymmErrors* AliceCentralNsd900()
  *
  * @return graph of data 
  * 
- * @ingroup pwg2_forward_analysis_otherdata
+ * @ingroup pwg2_forward_otherdata
  */
 TGraphAsymmErrors* AliceCentralInel2360()
 {  
@@ -426,7 +431,7 @@ TGraphAsymmErrors* AliceCentralInel2360()
  *
  * @return graph of data 
  * 
- * @ingroup pwg2_forward_analysis_otherdata
+ * @ingroup pwg2_forward_otherdata
  */
 TGraphAsymmErrors* AliceCentralNsd2360()
 {  
@@ -477,7 +482,7 @@ TGraphAsymmErrors* AliceCentralNsd2360()
  *
  * @return graph of data 
  * 
- * @ingroup pwg2_forward_analysis_otherdata
+ * @ingroup pwg2_forward_otherdata
  */
 TGraphAsymmErrors* CMSNsd900()
 {
@@ -506,7 +511,7 @@ TGraphAsymmErrors* CMSNsd900()
  *
  * @return graph of data 
  * 
- * @ingroup pwg2_forward_analysis_otherdata
+ * @ingroup pwg2_forward_otherdata
  */
 TGraphAsymmErrors* CMSNsd2360()
 {
@@ -533,7 +538,7 @@ TGraphAsymmErrors* CMSNsd2360()
  *
  * @return graph of data 
  * 
- * @ingroup pwg2_forward_analysis_otherdata
+ * @ingroup pwg2_forward_otherdata
  */
 TGraphAsymmErrors* CMSNsd7000()
 {
@@ -562,7 +567,7 @@ TGraphAsymmErrors* CMSNsd7000()
  * 
  * @return A multi graph with the selected data. 
  * 
- * @ingroup pwg2_forward_analysis_otherdata
+ * @ingroup pwg2_forward_otherdata
  */
 TMultiGraph* 
 GetData(Int_t energy, Int_t type)
@@ -637,7 +642,7 @@ GetData(Int_t energy, Int_t type)
  * @param energy  Energy in GeV
  * @param type    Trigger type bit mask 
  * 
- * @ingroup pwg2_forward_analysis_otherdata
+ * @ingroup pwg2_forward_otherdata
  */
 void
 OtherData(Int_t energy=900, Int_t type=0x1)
diff --git a/PWG2/FORWARD/analysis2/Pass1.C b/PWG2/FORWARD/analysis2/Pass1.C
index ada9852d20f..98c68e1354e 100644
--- a/PWG2/FORWARD/analysis2/Pass1.C
+++ b/PWG2/FORWARD/analysis2/Pass1.C
@@ -1,3 +1,8 @@
+/**
+ * @file 
+ * 
+ * @ingroup pwg2_forward_scripts
+ */
 /** 
  * Run first pass of the analysis - that is read in ESD and produce AOD
  * 
@@ -29,7 +34,7 @@
  * function is then called
  * 
  *
- * @ingroup pwg2_forward_analysis_scripts
+ * @ingroup pwg2_forward_scripts
  */
 void
 Pass1(const char* esddir=".", 
diff --git a/PWG2/FORWARD/analysis2/Pass2.C b/PWG2/FORWARD/analysis2/Pass2.C
index 4e756933f1a..91d70cdd693 100644
--- a/PWG2/FORWARD/analysis2/Pass2.C
+++ b/PWG2/FORWARD/analysis2/Pass2.C
@@ -1,3 +1,8 @@
+/**
+ * @file 
+ * 
+ * @ingroup pwg2_forward_scripts
+ */
 /** 
  * Read in AOD and generate @f$ dN/d\eta@f$ for the selected 
  * trigger classes and vertex ranges 
@@ -12,7 +17,7 @@
  * @param hhd      Whether to do HHD comparison
  * @param comp     Whether to do comparisons 
  *
- * @ingroup pwg2_forward_analysis_scripts
+ * @ingroup pwg2_forward_scripts
  */
 void
 Pass2(const char* file="AliAODs.root", 
diff --git a/PWG2/FORWARD/analysis2/RunELossFitter.C b/PWG2/FORWARD/analysis2/RunELossFitter.C
index e0bc0de32e5..e1a14587c7c 100644
--- a/PWG2/FORWARD/analysis2/RunELossFitter.C
+++ b/PWG2/FORWARD/analysis2/RunELossFitter.C
@@ -1,13 +1,13 @@
-/** 
- * Flags for the analysis
- *
- * @ingroup pwg2_forward_analysis_scripts
+/**
+ * @file 
+ * 
+ * @ingroup pwg2_forward_scripts
  */
 /** 
  * Run a pass on ESD data to produce the energ loss fits 
  * 
  *
- * @ingroup pwg2_forward_analysis_scripts
+ * @ingroup pwg2_forward_scripts
  */
 void RunELossFitter(const char* esddir, 
 		    Int_t       nEvents=1000, 
diff --git a/PWG2/FORWARD/analysis2/RunManager.C b/PWG2/FORWARD/analysis2/RunManager.C
index ea5e09c7af2..b025ba7d592 100644
--- a/PWG2/FORWARD/analysis2/RunManager.C
+++ b/PWG2/FORWARD/analysis2/RunManager.C
@@ -1,7 +1,12 @@
+/**
+ * @file 
+ * 
+ * @ingroup pwg2_forward_scripts
+ */
 /** 
  * Flags for the analysis
  *
- * @ingroup pwg2_forward_analysis_scripts
+ * @ingroup pwg2_forward_scripts
  */
 enum {
   kMC        = 0x01, // MC input 
@@ -42,7 +47,7 @@ enum {
  * function is then called
  * 
  *
- * @ingroup pwg2_forward_analysis_scripts
+ * @ingroup pwg2_forward_scripts
  */
 void RunManager(const char* esddir, 
 		Int_t       nEvents=1000, 
diff --git a/PWG2/FORWARD/corrections/DoubleHit/doublehit_pp_0900GeV_p5kG_real.root b/PWG2/FORWARD/corrections/DoubleHit/doublehit_pp_0900GeV_p5kG_real.root
new file mode 100644
index 00000000000..9fad83f048e
Binary files /dev/null and b/PWG2/FORWARD/corrections/DoubleHit/doublehit_pp_0900GeV_p5kG_real.root differ
diff --git a/PWG2/FORWARD/corrections/ELossFits/elossfits_pp_0900GeV_p5kG_real.root b/PWG2/FORWARD/corrections/ELossFits/elossfits_pp_0900GeV_p5kG_real.root
new file mode 100644
index 00000000000..32f07928a12
Binary files /dev/null and b/PWG2/FORWARD/corrections/ELossFits/elossfits_pp_0900GeV_p5kG_real.root differ
diff --git a/PWG2/FORWARD/corrections/MergingEfficiency/merging_pp_0900GeV_p5kG_real.root b/PWG2/FORWARD/corrections/MergingEfficiency/merging_pp_0900GeV_p5kG_real.root
new file mode 100644
index 00000000000..34ac94dd8b6
Binary files /dev/null and b/PWG2/FORWARD/corrections/MergingEfficiency/merging_pp_0900GeV_p5kG_real.root differ
diff --git a/PWG2/FORWARD/corrections/SecondaryMap/secondary_pp_0900GeV_p5kG_real.root b/PWG2/FORWARD/corrections/SecondaryMap/secondary_pp_0900GeV_p5kG_real.root
new file mode 100644
index 00000000000..d14e64b1432
Binary files /dev/null and b/PWG2/FORWARD/corrections/SecondaryMap/secondary_pp_0900GeV_p5kG_real.root differ
diff --git a/PWG2/FORWARD/corrections/VertexBias/vertexbias_pp_0900GeV_p5kG_real.root b/PWG2/FORWARD/corrections/VertexBias/vertexbias_pp_0900GeV_p5kG_real.root
new file mode 100644
index 00000000000..3e113907809
Binary files /dev/null and b/PWG2/FORWARD/corrections/VertexBias/vertexbias_pp_0900GeV_p5kG_real.root differ