Increment the version number
[u/mrichter/AliRoot.git] / RICH / AliRICHDisplay.cxx
index 5f44839..3aed8aa 100644 (file)
 
 /*
   $Log$
+  Revision 1.16  2001/10/21 18:31:24  hristov
+  Several pointers were set to zero in the default constructors to avoid memory management problems
+
+  Revision 1.15  2001/10/09 07:34:09  hristov
+  Modifications needed by Root.03.01.06 (J.Chudoba)
+
+  Revision 1.14  2001/05/16 14:57:20  alibrary
+  New files for folders and Stack
+
+  Revision 1.13  2001/05/10 12:35:16  jbarbosa
+  Removed hit display, added rec. ring properties.
+
+  Revision 1.12  2001/03/14 18:15:03  jbarbosa
+  Changes to adapt to new IO.
+  Removed verbose output.
+
+  Revision 1.11  2001/02/27 15:21:34  jbarbosa
+  Transition to SDigits.
+
+  Revision 1.10  2001/02/13 20:18:48  jbarbosa
+  Corrected some more positioning of points. Changes in LoadDigits to accomodate the new IO.
+
+  Revision 1.9  2000/11/01 15:33:11  jbarbosa
+  Updated to handle both reconstruction algorithms.
+
+  Revision 1.8  2000/10/03 21:44:09  morsch
+  Use AliSegmentation and AliHit abstract base classes.
+
+  Revision 1.7  2000/10/02 21:28:12  fca
+  Removal of useless dependecies via forward declarations
+
   Revision 1.6  2000/10/02 15:46:38  jbarbosa
   Fixed forward declarations.
 
 #include "AliRICHConst.h"
 #include "AliRICHDisplay.h"
 #include "AliRICHPoints.h"
+#include "AliHeader.h"
 
 #include "AliRICHHit.h"
 #include "AliRICHCerenkov.h"
-#include "AliRICHPadHit.h"
+#include "AliRICHSDigit.h"
 #include "AliRICHDigit.h"
 #include "AliRICHRawCluster.h"
-#include "AliRICHRecHit.h"
+#include "AliRICHRecHit1D.h"
+#include "AliRICHRecHit3D.h"
 #include "AliRICHEllipse.h"
 
 ClassImp(AliRICHDisplay)
@@ -93,7 +126,7 @@ AliRICHDisplay::AliRICHDisplay()
 { 
 
 // default constructor
-
+    fColPad = 0;
     fPoints = 0;
     fPhits = 0;
     fPCerenkovs = 0;
@@ -218,7 +251,6 @@ AliRICHDisplay::AliRICHDisplay(Int_t size)
     Float_t dxtr     = 0.15;
     Float_t dytr     = 0.45;
     fTrigPad = new TPad("trigger", "range and mode pad",0,0,dxtr,dytr);
-    fTrigPad->SetEditable(kFALSE);
     fTrigPad->Draw();
     fTrigPad->cd();
     fTrigPad->SetFillColor(22);
@@ -243,6 +275,8 @@ AliRICHDisplay::AliRICHDisplay(Int_t size)
     button->Draw();
     AppendPad(); // append display object as last object to force selection
     
+    fTrigPad->SetEditable(kFALSE);
+    fButtons->SetEditable(kFALSE);
     fCanvas->cd();
     fCanvas->Update();
 }
@@ -286,7 +320,6 @@ void AliRICHDisplay::DisplayButtons()
     
     
     fButtons = new TPad("buttons", "newpad",0,0.45,0.15,1);
-    fButtons->SetEditable(kFALSE);
     fButtons->Draw();
     fButtons->SetFillColor(38);
     fButtons->SetBorderSize(2);
@@ -517,7 +550,7 @@ void AliRICHDisplay::DrawRecHits()
     points = fRecpoints;
     if (!points) return;
     nrec = points->GetEntriesFast();
-    printf("Nrec %d\n",nrec);
+    //printf("Nrec %d\n",nrec);
     for (irec=0; irec < nrec; irec++) {
        pm = (AliRICHPoints*)points->UncheckedAt(irec);
        if (!pm) continue;
@@ -666,12 +699,15 @@ void AliRICHDisplay::DrawView(Float_t theta, Float_t phi, Float_t psi)
    
    //add clusters to the pad
    DrawClusters();
-   DrawHits();
+   //DrawHits();
 //   DrawCerenkovs();
-   printf("Calling DrawCoG\n");
-   DrawCoG();
-   printf("Calling DrawRecHits\n");
-   DrawRecHits();
+   if (gAlice->TreeR())
+     {
+       //printf("Calling DrawCoG\n");
+       DrawCoG();
+       //printf("Calling DrawRecHits\n");
+       DrawRecHits();
+     }
    /*for (Int_t i=0;i<7;i++)
      LoadRecHits(i,1);*/
    
@@ -695,7 +731,8 @@ void AliRICHDisplay::ExecuteEvent(Int_t event, Int_t px, Int_t py)
    
    if (px == 0 && py == 0) { //when called by sliders
        if (event == kButton1Up) {
-          Draw();
+        printf("Drawing event %d\n",event);
+        Draw();
        }
        return;
    }
@@ -757,14 +794,14 @@ void AliRICHDisplay::LoadCoG(Int_t chamber, Int_t cathode)
 
    if (chamber > 6) return;
 
-   printf("Entering LoadCoG\n");
+   //printf("Entering LoadCoG\n");
 
 
    AliRICH *pRICH  = (AliRICH*)gAlice->GetModule("RICH");
    AliRICHChamber*  iChamber;
 
    TClonesArray *pRICHrawclust  = pRICH->RawClustAddress(chamber);
-   printf ("Chamber:%d has adress:%p\n", chamber, pRICHrawclust );
+   //printf ("Chamber:%d has adress:%p\n", chamber, pRICHrawclust );
    if (pRICHrawclust == 0) return;
 
    pRICH->ResetRawClusters();
@@ -773,7 +810,7 @@ void AliRICHDisplay::LoadCoG(Int_t chamber, Int_t cathode)
    Int_t nent=(Int_t)gAlice->TreeR()->GetEntries();
    gAlice->TreeR()->GetEvent(nent-1+cathode-1);
    Int_t nrawcl = pRICHrawclust->GetEntriesFast();
-   printf ("nrawcl:%d\n",nrawcl);
+   //printf ("nrawcl:%d\n",nrawcl);
    if (nrawcl == 0) return;
    if (fRpoints == 0) fRpoints = new TObjArray(nrawcl);
    
@@ -793,7 +830,7 @@ void AliRICHDisplay::LoadCoG(Int_t chamber, Int_t cathode)
        points->SetHitIndex(-1);
        points->SetTrackIndex(-1);
        points->SetDigitIndex(-1);
-       Float_t  vectorLoc[3]={mRaw->fX,6.276,mRaw->fY};
+       Float_t  vectorLoc[3]={mRaw->fX,5,mRaw->fY};
        Float_t  vectorGlob[3];
        iChamber->LocaltoGlobal(vectorLoc,vectorGlob);
        points->SetPoint(iraw,vectorGlob[0],vectorGlob[1],vectorGlob[2]);
@@ -807,60 +844,120 @@ void AliRICHDisplay::LoadRecHits(Int_t chamber, Int_t cathode)
 
    if (chamber > 6) return;
 
-   printf("Entering LoadRecHits\n");
+   ///printf("Entering LoadRecHits\n");
 
 
    AliRICH *pRICH  = (AliRICH*)gAlice->GetModule("RICH");
    AliRICHChamber*  iChamber;
 
-   TClonesArray *pRICHrechits  = pRICH->RecHitsAddress(chamber);
-   printf ("Chamber:%d\n", chamber);
-   if (pRICHrechits == 0) return;
+   TClonesArray *pRICHrechits1D  = pRICH->RecHitsAddress1D(chamber);
+   //printf ("Chamber:%d\n", chamber);
+   if (pRICHrechits1D != 0)
+     {
 
-   //RICH->ResetRecHits();
+       //RICH->ResetRecHits();
 
 
-   Int_t nent=(Int_t)gAlice->TreeR()->GetEntries();
-   gAlice->TreeR()->GetEvent(nent-1+cathode-1);
-   Int_t nrechits = pRICHrechits->GetEntriesFast();
-   printf ("nrechits:%d\n",nrechits);
-   if (nrechits == 0) return;
-   if (fRecpoints == 0) fRecpoints = new TObjArray(50);
-   
-   iChamber = &(pRICH->Chamber(chamber));
-   AliRICHRecHit  *mRec;
-   AliRICHPoints *points = 0;
-   //AliRICHEllipse *ellipse = 0;
-   //
-   //loop over all rechits and store their position  
-
-   points = new AliRICHPoints(nrechits);
-   for (Int_t irec=0;irec<nrechits;irec++) {
-       mRec   = (AliRICHRecHit*)pRICHrechits->UncheckedAt(irec);
-       fRecpoints->AddAt(points,irec);
-       points->SetMarkerColor(38);
-       points->SetMarkerStyle(8);
-       points->SetMarkerSize(1.);
-       points->SetParticle(-1);
-       points->SetHitIndex(-1);
-       points->SetTrackIndex(-1);
-       points->SetDigitIndex(-1);
-       Float_t  vectorLoc[3]={mRec->fX,6.276,mRec->fY};
-       Float_t  vectorGlob[3];
-       iChamber->LocaltoGlobal(vectorLoc,vectorGlob);
-       points->SetPoint(irec,vectorGlob[0],vectorGlob[1],vectorGlob[2]);
-       //Float_t theta = iChamber->GetRotMatrix()->GetTheta();
-       //Float_t phi   = iChamber->GetRotMatrix()->GetPhi();      
-       //ellipse=new TEllipse(vectorGlob[0],vectorGlob[2],10,10,0,360,phi);
-       printf("Generating ellipse %d\n",irec);
-       AliRICHEllipse *ellipse=new AliRICHEllipse(mRec->fX,mRec->fY,mRec->fOmega,mRec->fTheta,mRec->fPhi,mRec->fEmissPoint);
-       ellipse->CerenkovRingDrawing(chamber,irec);
-       //ellipse->SetFillStyle(1001);
-       ellipse->SetMarkerColor(38);
-       ellipse->Draw();
-       //marker->SetRefObject((TObject*)points);
-       //points->Set3DMarker(0, marker); 
-   }
+       Int_t nent1D=(Int_t)gAlice->TreeR()->GetEntries();
+       gAlice->TreeR()->GetEvent(nent1D-1+cathode-1);
+       Int_t nrechits1D = pRICHrechits1D->GetEntriesFast();
+       //printf ("nrechits1D:%d\n",nrechits1D);
+       if (nrechits1D != 0)
+        {
+          if (fRecpoints == 0) fRecpoints = new TObjArray(50);
+          
+          iChamber = &(pRICH->Chamber(chamber));
+          AliRICHRecHit1D  *mRec1D;
+          AliRICHPoints *points1D = 0;
+          //AliRICHEllipse *ellipse = 0;
+          //
+          //loop over all rechits and store their position  
+          
+          points1D = new AliRICHPoints(nrechits1D);
+          for (Int_t irec=0;irec<nrechits1D;irec++) {
+            mRec1D   = (AliRICHRecHit1D*)pRICHrechits1D->UncheckedAt(irec);
+            fRecpoints->AddAt(points1D,irec);
+            points1D->SetMarkerColor(38);
+            points1D->SetMarkerStyle(8);
+            points1D->SetMarkerSize(1.);
+            points1D->SetParticle(-1);
+            points1D->SetHitIndex(-1);
+            points1D->SetTrackIndex(-1);
+            points1D->SetDigitIndex(-1);
+            Float_t  vectorLoc[3]={mRec1D->fX,5,mRec1D->fY};
+            Float_t  vectorGlob[3];
+            iChamber->LocaltoGlobal(vectorLoc,vectorGlob);
+            points1D->SetPoint(irec,vectorGlob[0],vectorGlob[1],vectorGlob[2]);
+            //Float_t theta = iChamber->GetRotMatrix()->GetTheta();
+            //Float_t phi   = iChamber->GetRotMatrix()->GetPhi();         
+            //ellipse=new TEllipse(vectorGlob[0],vectorGlob[2],10,10,0,360,phi);
+            //printf("Generating ellipse %d\n",irec);
+            AliRICHEllipse *ellipse=new AliRICHEllipse(mRec1D->fX,mRec1D->fY,mRec1D->fOmega,mRec1D->fTheta,mRec1D->fPhi,mRec1D->fEmissPoint);
+            printf("Ring at x:%f, y:%f - Omega:%f rad, theta:%3.1f deg, phi:%3.1f deg\n",mRec1D->fX,mRec1D->fY,mRec1D->fOmega,mRec1D->fTheta*180/TMath::Pi(),mRec1D->fPhi*180/TMath::Pi());
+            printf("fEmissPoint:%f\n",mRec1D->fEmissPoint);
+            ellipse->CerenkovRingDrawing(chamber,irec);
+            //ellipse->SetFillStyle(1001);
+            ellipse->SetMarkerColor(38);
+            ellipse->Draw();
+            //marker->SetRefObject((TObject*)points1D);
+            //points1D->Set3DMarker(0, marker); 
+          }
+        }
+     }
+
+   TClonesArray *pRICHrechits3D  = pRICH->RecHitsAddress3D(chamber);
+   //printf ("Chamber:%d\n", chamber);
+   if (pRICHrechits3D != 0)
+     {
+       
+       //RICH->ResetRecHits();
+       
+       
+       Int_t nent3D=(Int_t)gAlice->TreeR()->GetEntries();
+       gAlice->TreeR()->GetEvent(nent3D-1+cathode-1);
+       Int_t nrechits3D = pRICHrechits3D->GetEntriesFast();
+       //printf ("nrechits3D:%d\n",nrechits3D);
+       if (nrechits3D != 0)
+        {
+          if (fRecpoints == 0) fRecpoints = new TObjArray(50);
+          
+          iChamber = &(pRICH->Chamber(chamber));
+          AliRICHRecHit3D  *mRec3D;
+          AliRICHPoints *points3D = 0;
+          //AliRICHEllipse *ellipse = 0;
+          //
+          //loop over all rechits and store their position  
+          
+          points3D = new AliRICHPoints(nrechits3D);
+          for (Int_t irec=0;irec<nrechits3D;irec++) {
+            mRec3D   = (AliRICHRecHit3D*)pRICHrechits3D->UncheckedAt(irec);
+            fRecpoints->AddAt(points3D,irec);
+            points3D->SetMarkerColor(42);
+            points3D->SetMarkerStyle(8);
+            points3D->SetMarkerSize(1.);
+            points3D->SetParticle(-1);
+            points3D->SetHitIndex(-1);
+            points3D->SetTrackIndex(-1);
+            points3D->SetDigitIndex(-1);
+            Float_t  vectorLoc[3]={mRec3D->fX,5,mRec3D->fY};
+            Float_t  vectorGlob[3];
+            iChamber->LocaltoGlobal(vectorLoc,vectorGlob);
+            points3D->SetPoint(irec,vectorGlob[0],vectorGlob[1],vectorGlob[2]);
+            //Float_t theta = iChamber->GetRotMatrix()->GetTheta();
+            //Float_t phi   = iChamber->GetRotMatrix()->GetPhi();         
+            //ellipse=new TEllipse(vectorGlob[0],vectorGlob[2],10,10,0,360,phi);
+            //printf("Generating ellipse %d\n",irec);
+            AliRICHEllipse *ellipse=new AliRICHEllipse(mRec3D->fX,mRec3D->fY,mRec3D->fOmega,mRec3D->fTheta,mRec3D->fPhi,0.75);
+            printf("Ring at x:%f, y:%f - Omega:%f rad, theta:%3.1f deg, phi:%3.1f deg\n",mRec3D->fX,mRec3D->fY,mRec3D->fOmega,mRec3D->fTheta*180/TMath::Pi(),mRec3D->fPhi*180/TMath::Pi());
+            ellipse->CerenkovRingDrawing(chamber,irec);
+            //ellipse->SetFillStyle(1001);
+            ellipse->SetMarkerColor(42);
+            ellipse->Draw();
+            //marker->SetRefObject((TObject*)points3D);
+            //points3D->Set3DMarker(0, marker); 
+          }
+        }
+     }
 }
 //___________________________________________
 void AliRICHDisplay::LoadDigits()
@@ -871,56 +968,64 @@ void AliRICHDisplay::LoadDigits()
    ResetPoints();
    AliRICH *pRICH  = (AliRICH*)gAlice->GetDetector("RICH");
    AliRICHChamber*       iChamber;
-   AliRICHSegmentation*  segmentation;
+   AliSegmentation*      segmentation;
    Int_t nAllDigits=0;
    Int_t ich;
+
+   //printf("Entering LoadDigits\n");
+
+   if (gAlice->TreeD())
+     {
    
-   for (ich=0; ich<kNCH; ich++) {
-       TClonesArray *pRICHdigits  = pRICH->DigitsAddress(ich);
-       if (pRICHdigits == 0) continue;
-       gAlice->ResetDigits();
-       gAlice->TreeD()->GetEvent(1);
-       Int_t ndigits = pRICHdigits->GetEntriesFast();
-        nAllDigits+=ndigits;
-   }
-   if (fPoints == 0) fPoints = new TObjArray(nAllDigits);   
-   Int_t counter=0;
-   for (ich=0; ich<kNCH; ich++) {
-       TClonesArray *pRICHdigits  = pRICH->DigitsAddress(ich);
-       if (pRICHdigits == 0) continue;
-       gAlice->ResetDigits();
-       gAlice->TreeD()->GetEvent(1);
-       Int_t ndigits = pRICHdigits->GetEntriesFast();
-       if (ndigits == 0) continue;
-       iChamber = &(pRICH->Chamber(ich));
-       segmentation=iChamber->GetSegmentationModel();
-       Float_t dpx  = segmentation->Dpx();
-       Float_t dpy  = segmentation->Dpy();
-
-       //printf("Dpx:%d, Dpy:%d\n",dpx,dpy);
-       
-       AliRICHDigit  *mdig;
-       AliRICHPoints *points = 0;
-       TMarker3DBox  *marker = 0;
-       //
-       //loop over all digits and store their position
-       Int_t npoints=1;
+       for (ich=0; ich<kNCH; ich++) {
+        TClonesArray *pRICHdigits  = pRICH->DigitsAddress(ich);
+        //printf ("Chamber:%d has adress:%p\n", ich, pRICHdigits );
+        if (pRICHdigits == 0) continue;
+        gAlice->ResetDigits();
+        gAlice->TreeD()->GetEvent(0);
+        Int_t ndigits = pRICHdigits->GetEntriesFast();
+        //printf("ndigits:%d\n",ndigits);
+        nAllDigits+=ndigits;
+       }
        
-       for (Int_t digit=0;digit<ndigits;digit++) {
+       if (fPoints == 0) fPoints = new TObjArray(nAllDigits);   
+       Int_t counter=0;
+       for (ich=0; ich<kNCH; ich++) {
+        TClonesArray *pRICHdigits  = pRICH->DigitsAddress(ich);
+        if (pRICHdigits == 0) continue;
+        gAlice->ResetDigits();
+        gAlice->TreeD()->GetEvent(0);
+        Int_t ndigits = pRICHdigits->GetEntriesFast();
+        if (ndigits == 0) continue;
+        iChamber = &(pRICH->Chamber(ich));
+        segmentation=iChamber->GetSegmentationModel();
+        Float_t dpx  = segmentation->Dpx();
+        Float_t dpy  = segmentation->Dpy();
+        
+        //printf("Dpx:%d, Dpy:%d\n",dpx,dpy);
+        
+        AliRICHDigit  *mdig;
+        AliRICHPoints *points = 0;
+        TMarker3DBox  *marker = 0;
+        //
+        //loop over all digits and store their position
+        Int_t npoints=1;
+        
+        for (Int_t digit=0;digit<ndigits;digit++) {
           mdig    = (AliRICHDigit*)pRICHdigits->UncheckedAt(digit);
           points = new AliRICHPoints(npoints);
           fPoints->AddAt(points,counter);
           counter++;
-          Int_t charge=mdig->fSignal;
+          Int_t charge=mdig->Signal();
           Int_t index=Int_t(TMath::Log(charge)/(TMath::Log(adc_satm)/22));
           Int_t color=701+index;
           if (color>722) color=722;
           points->SetMarkerColor(color);
           points->SetMarkerStyle(21);
           points->SetMarkerSize(0.5);
-          Float_t xpad, ypad;
-          segmentation->GetPadCxy(mdig->fPadX, mdig->fPadY,xpad, ypad);
-          Float_t vectorLoc[3]={xpad,6.276,ypad};
+          Float_t xpad, ypad, zpad;
+          segmentation->GetPadC(mdig->PadX(), mdig->PadY(),xpad, ypad, zpad);
+          Float_t vectorLoc[3]={xpad,5,ypad};
           Float_t  vectorGlob[3];
           iChamber->LocaltoGlobal(vectorLoc,vectorGlob);
           points->SetParticle(-1);
@@ -928,8 +1033,9 @@ void AliRICHDisplay::LoadDigits()
           points->SetTrackIndex(-1);
           points->SetDigitIndex(digit);
           points->SetPoint(0,vectorGlob[0],vectorGlob[1],vectorGlob[2]);
+          //printf("Y position (digit): %f\n", vectorGlob[1]);
           
-          segmentation->GetPadCxy(mdig->fPadX, mdig->fPadY, xpad, ypad);
+          segmentation->GetPadC(mdig->PadX(), mdig->PadY(), xpad, ypad, zpad);
           Float_t theta = iChamber->GetRotMatrix()->GetTheta();
           Float_t phi   = iChamber->GetRotMatrix()->GetPhi();     
           marker=new TMarker3DBox(vectorGlob[0],vectorGlob[1],vectorGlob[2],
@@ -939,8 +1045,9 @@ void AliRICHDisplay::LoadDigits()
           marker->SetFillColor(color);
           marker->SetRefObject((TObject*)points);
           points->Set3DMarker(0, marker);
-       } // loop over digits
-   } // loop over chambers 
+        } // loop over digits
+       } // loop over chambers 
+     } //if TreeD
 }
 
 
@@ -993,8 +1100,7 @@ void AliRICHDisplay::LoadHits(Int_t chamber)
            points = new AliRICHPoints(1);
            fPhits->AddAt(points,npoints);
             mHit = (AliRICHHit*)pRICHhits->UncheckedAt(hit);
-           TParticle *current = 
-               (TParticle*)(*gAlice->Particles())[mHit->Track()];
+           TParticle *current = (TParticle*)gAlice->Particle(mHit->Track());
            if (current->GetPdgCode() == 50000050) {
                points->SetMarkerColor(kBlue);
            } else if (current->GetPdgCode() == 50000051) {
@@ -1009,6 +1115,7 @@ void AliRICHDisplay::LoadHits(Int_t chamber)
             points->SetTrackIndex(track);
             points->SetDigitIndex(-1);
             points->SetPoint(hit,mHit->X(), mHit->Y(), mHit->Z());
+           //printf("Y position: %f\n", mHit->Y());
            npoints++;
        }
     }
@@ -1119,7 +1226,7 @@ void AliRICHDisplay::SetChamberAndCathode(Int_t chamber, Int_t cathode)
     fChamber = chamber;
     fCathode = cathode;
     
-    printf("SetChamberAndCathode - fChamber fCathode %d %d\n",fChamber,fCathode);
+    //printf("SetChamberAndCathode - fChamber fCathode %d %d\n",fChamber,fCathode);
     if (!fPad) return;
     fPad->Clear();
     LoadDigits();