From Ludovic: updates for V0 visualization.

diff --git a/EVE/Reve/V0.cxx b/EVE/Reve/V0.cxx
index ec89c0b18c7df14525d17a4f47525fbf4e7de34d..42775385a5255e24ce84a17ced69465fd016c588 100644 (file)
--- a/EVE/Reve/V0.cxx
+++ b/EVE/Reve/V0.cxx
@@ -527,6 +527,7 @@ void V0List::MakeMarkers() {
 //_________________________________________________________________________
 void V0List::AdjustHist(Int_t iHist) {
 
+  if ((iHist<0)||(iHist>=fgkNcutVar)) return;
   if (! fHist[iHist]) return;
   
   TString name = fHist[iHist]->GetName();

diff --git a/EVE/Reve/V0Editors.cxx b/EVE/Reve/V0Editors.cxx
index e57176b484ef4eacc97c974a01914fadbfbd2231..44814d4e3c529e3d8d66a55df77883321df44b6b 100644 (file)
--- a/EVE/Reve/V0Editors.cxx
+++ b/EVE/Reve/V0Editors.cxx
@@ -90,7 +90,7 @@ V0ListEditor::V0ListEditor(const TGWindow *p,
   AddSelectTab();
   AddSeeTab();
 
-  TGTextButton* resetCutsButton = new TGTextButton(this, "Reset index cut", 40);
+  TGTextButton* resetCutsButton = new TGTextButton(this, "Reset all cuts", 40);
   resetCutsButton->Connect("Clicked()", "Reve::V0ListEditor", this, "ResetCuts()");
   AddFrame(resetCutsButton, new TGLayoutHints(kLHintsTop, 3, 1, 1, 0));
 }
@@ -305,19 +305,34 @@ void V0ListEditor::ResetCuts() {
 
   if (! fMList) return;
 
+  Float_t min,max;
+
+  for (Int_t i=0; i<fgkNRange;i++) {
+    
+    if (i==12) continue;
+    min = fRange[i]->GetLimitMin();
+    max = fRange[i]->GetLimitMax();
+    fMList->SetMin(i, min);
+    fMList->SetMax(i, max);
+    fRange[i]->SetValues(min, max);
+    fMList->AdjustHist(i);
+  }
+
+  // for the Index we scan its actual range
   Int_t imin, imax;
   fMList->GetV0IndexRange(imin, imax);
   if (imin<imax) {
-    Int_t minH = imin-(imax-imin)/20;
-    Int_t maxH = imax+(imax-imin)/20;
+    Int_t minH = imin - (imax-imin)/20;
+    Int_t maxH = imax + (imax-imin)/20;
     fMList->SetMin(12, minH);
     fMList->SetMax(12, maxH);
     fRange[12]->SetLimits(minH, maxH, TGNumberFormat::kNESInteger);
     fRange[12]->SetValues(minH, maxH);
-    AdjustHist(12);
+    fMList->AdjustHist(12);
 
   }
   FillCanvas();
+  Update();
 }
 
 
@@ -553,6 +568,6 @@ void V0ListEditor::PtRange()
 //_________________________________________________________________________
   void V0ListEditor::PosEtaRange() {
   fMList->PosEtaFilter(fRange[11]->GetMin(), fRange[11]->GetMax());
-  UpdateAll(12);
+  UpdateAll(13);
 }
 

diff --git a/EVE/Reve/V0Editors.h b/EVE/Reve/V0Editors.h
index 3262ba18de5f273d528a6e62db9e6f90b17afc4d..f088908e255ca8cf815a5afa80223280ba110073 100644 (file)
--- a/EVE/Reve/V0Editors.h
+++ b/EVE/Reve/V0Editors.h
@@ -97,6 +97,6 @@ public:
   ClassDef(V0ListEditor, 1); // Editor for V0List
 }; // endclass V0ListEditor
 
-}
+} // end namespace Reve
 
 #endif

diff --git a/EVE/alice-macros/esd_V0.C b/EVE/alice-macros/esd_V0.C
index 4fc838f4c2dc7112783cac52755b23aefc6e9001..104161743812a1837d9ef2d9871d6f0874a7f4b5 100644 (file)
--- a/EVE/alice-macros/esd_V0.C
+++ b/EVE/alice-macros/esd_V0.C
@@ -13,10 +13,10 @@
 // using namespace Alieve;
 
 
-Reve::V0*
-esd_make_V0(Reve::TrackRnrStyle* rnrStyle, AliESDVertex* primVtx,
-           AliESDtrack* neg, AliESDtrack* pos, AliESDv0* v0, Int_t i)
-{
+Reve::V0* esd_make_v0(Reve::TrackRnrStyle* rnrStyle, AliESDVertex* primVtx,
+                     AliESDtrack* neg, AliESDtrack* pos, AliESDv0* v0, Int_t i) {
+
+
   if (! v0->GetOnFlyStatus()) { // v0 on fly do not have the momentum vector filled...
   Reve::RecTrack  rcPos;
   Reve::RecTrack  rcNeg;
@@ -60,11 +60,7 @@ esd_make_V0(Reve::TrackRnrStyle* rnrStyle, AliESDVertex* primVtx,
   Double_t primx = primVtx->GetXv(),
     primy = primVtx->GetYv(),
     primz = primVtx->GetZv();
-  myV0->SetCosPointingAngle(v0->GetV0CosineOfPointingAngle(primx,primy,primz ));
-
-//   myV0->SetCosPointingAngle(v0->GetV0CosineOfPointingAngle(primVtx->GetXv(),
-//                         primVtx->GetYv(),primVtx->GetZv() ));
-
+  myV0->SetCosPointingAngle(v0->GetV0CosineOfPointingAngle(primx,primy,primz));
 
   myV0->SetDecayLength(primVtx->GetXv(), primVtx->GetYv(), primVtx->GetZv());
 
@@ -76,8 +72,7 @@ esd_make_V0(Reve::TrackRnrStyle* rnrStyle, AliESDVertex* primVtx,
 }
 
 
-Reve::V0List*
-esd_V0(Double_t min_pt=0.1, Double_t max_pt=100)
+Reve::V0List* esd_V0(Double_t min_pt=0.1, Double_t max_pt=100)
 {
 
   AliESD* esd = Alieve::Event::AssertESD();
@@ -102,7 +97,7 @@ esd_V0(Double_t min_pt=0.1, Double_t max_pt=100)
     AliESDtrack* negTr = esd->GetTrack(negInd);
     AliESDtrack* posTr = esd->GetTrack(posInd);
     
-    Reve::V0* myV0 = esd_make_V0(rnrStyle, primVertex, negTr,posTr, v0, n);
+    Reve::V0* myV0 = esd_make_v0(rnrStyle, primVertex, negTr,posTr, v0, n);
     if (myV0) {
       gReve->AddRenderElement(cont, myV0);
       count++;