Transition to NewIO

[u/mrichter/AliRoot.git] / MUON / AliMUONChamber.cxx

diff --git a/MUON/AliMUONChamber.cxx b/MUON/AliMUONChamber.cxx
index 29b3a4734f8ff45927a017a15300970499faa355..ee8cbadfff8561389eabd920e9312d0cf8a7fbc1 100644 (file)
--- a/MUON/AliMUONChamber.cxx
+++ b/MUON/AliMUONChamber.cxx
@@ -12,38 +12,52 @@
  * about the suitability of this software for any purpose. It is          *
  * provided "as is" without express or implied warranty.                  *
  **************************************************************************/
-/*
-$Log$
-Revision 1.1.2.5  2000/06/09 21:27:01  morsch
-Most coding rule violations corrected.
 
-Revision 1.1.2.4  2000/05/05 11:34:12  morsch
-Log inside comments.
-
-Revision 1.1.2.3  2000/05/05 10:09:52  morsch
-Log messages included
-*/
+/* $Id$ */
 
+// --- MUON includes ---
 #include "AliMUONChamber.h"
-#include "AliMUONSegmentation.h"
-#include "AliMUONResponse.h"
 
+// --- ROOT includes ---
+
+#include "TRandom.h"
 #include "TMath.h"
+
 ClassImp(AliMUONChamber)       
 
-    AliMUONChamber::AliMUONChamber() 
+    AliMUONChamber::AliMUONChamber()
+{
+// Default constructor
+    fSegmentation = 0;
+    fResponse=0;
+    fnsec=1;
+    fReconstruction=0;
+    fId=0;
+    // to avoid mistakes if ChargeCorrelInit is not called
+    fCurrentCorrel =1;
+}
+
+    AliMUONChamber::AliMUONChamber(Int_t id) 
 {
+// Construtor with chamber id 
     fSegmentation = new TObjArray(2);
-    (*fSegmentation)[0] = 0;
-    (*fSegmentation)[1] = 0;    
+    fSegmentation->AddAt(0,0);
+    fSegmentation->AddAt(0,1);
     fResponse=0;
     fnsec=1;
     fReconstruction=0;
+    fId=id;
+    // to avoid mistakes if ChargeCorrelInit is not called
+    fCurrentCorrel =1;
 }
 
 AliMUONChamber::~AliMUONChamber() 
 {
-    if (fSegmentation) delete fSegmentation;
+// Destructor
+  if (fSegmentation) {
+    fSegmentation->Delete();
+    delete fSegmentation;
+  }
 }
 
 AliMUONChamber::AliMUONChamber(const AliMUONChamber& rChamber)
@@ -58,12 +72,16 @@ void AliMUONChamber::Init()
 // Initalisation ..
 //
 // ... for chamber segmentation
-    if ((*fSegmentation)[0]) 
-    ((AliMUONSegmentation *) (*fSegmentation)[0])->Init(this);
+  //PH    if ((*fSegmentation)[0]) 
+  //PH    ((AliSegmentation *) (*fSegmentation)[0])->Init(fId);
+    if (fSegmentation->At(0)) 
+    ((AliSegmentation *) fSegmentation->At(0))->Init(fId);
 
     if (fnsec==2) {
-       if ((*fSegmentation)[1])
-       ((AliMUONSegmentation *) (*fSegmentation)[1])->Init(this);
+      //PH     if ((*fSegmentation)[1])
+      //PH     ((AliSegmentation *) (*fSegmentation)[1])->Init(fId);
+       if (fSegmentation->At(1))
+       ((AliSegmentation *) fSegmentation->At(1))->Init(fId);
     }
 }
 
@@ -71,12 +89,15 @@ Int_t   AliMUONChamber::SigGenCond(Float_t x, Float_t y, Float_t z)
 {
 // Ask segmentation if signal should be generated 
     if (fnsec==1) {
-       return ((AliMUONSegmentation*) (*fSegmentation)[0])
+      //PH     return ((AliSegmentation*) (*fSegmentation)[0])
+       return ((AliSegmentation*) fSegmentation->At(0))
            ->SigGenCond(x, y, z) ;
     } else {
-       return (((AliMUONSegmentation*) (*fSegmentation)[0])
+      //PH     return (((AliSegmentation*) (*fSegmentation)[0])
+       return (((AliSegmentation*) fSegmentation->At(0))
                ->SigGenCond(x, y, z)) ||
-           (((AliMUONSegmentation*) (*fSegmentation)[1])
+      //PH         (((AliSegmentation*) (*fSegmentation)[1])
+           (((AliSegmentation*) fSegmentation->At(1))
             ->SigGenCond(x, y, z)) ;
     }
 }
@@ -88,15 +109,29 @@ void    AliMUONChamber::SigGenInit(Float_t x, Float_t y, Float_t z)
 // Initialisation of segmentation for hit
 //  
     if (fnsec==1) {
-       ((AliMUONSegmentation*) (*fSegmentation)[0])->SigGenInit(x, y, z) ;
+      //PH     ((AliSegmentation*) (*fSegmentation)[0])->SigGenInit(x, y, z) ;
+       ((AliSegmentation*) fSegmentation->At(0))->SigGenInit(x, y, z) ;
     } else {
-       ((AliMUONSegmentation*) (*fSegmentation)[0])->SigGenInit(x, y, z) ;
-       ((AliMUONSegmentation*) (*fSegmentation)[1])->SigGenInit(x, y, z) ;
+      //PH     ((AliSegmentation*) (*fSegmentation)[0])->SigGenInit(x, y, z) ;
+      //PH     ((AliSegmentation*) (*fSegmentation)[1])->SigGenInit(x, y, z) ;
+       ((AliSegmentation*) fSegmentation->At(0))->SigGenInit(x, y, z) ;
+       ((AliSegmentation*) fSegmentation->At(1))->SigGenInit(x, y, z) ;
     }
 }
 
+void AliMUONChamber::ChargeCorrelationInit() {
+// Initialisation of charge correlation for current hit
+// the value is stored, and then used by Disintegration
+if (fnsec==1) 
+    fCurrentCorrel =1;
+else 
+    // exponential is here to avoid eventual problems in 0 
+    // factor 2 because chargecorrel is q1/q2 and not q1/qtrue
+    fCurrentCorrel = TMath::Exp(gRandom->Gaus(0,fResponse->ChargeCorrel()/2));
+}
+
 void AliMUONChamber::DisIntegration(Float_t eloss, Float_t tof, 
-                                   Float_t xhit, Float_t yhit,
+                                   Float_t xhit, Float_t yhit, Float_t zhit,
                                    Int_t& nnew,Float_t newclust[6][500]) 
 {
 //    
@@ -116,32 +151,38 @@ void AliMUONChamber::DisIntegration(Float_t eloss, Float_t tof,
     
     Float_t qcheck=0, qp;
     nnew=0;
+    
+    // Cathode plane loop
     for (Int_t i=1; i<=fnsec; i++) {
        qcheck=0;
-       AliMUONSegmentation * segmentation=
-           (AliMUONSegmentation *) (*fSegmentation)[i-1];
-       for (segmentation->FirstPad(xhit, yhit, dx, dy); 
+       Float_t qcath = qtot * (i==1? fCurrentCorrel : 1/fCurrentCorrel);
+       AliSegmentation * segmentation=
+      //PH         (AliSegmentation *) (*fSegmentation)[i-1];
+           (AliSegmentation *) fSegmentation->At(i-1);
+       for (segmentation->FirstPad(xhit, yhit, zhit, dx, dy); 
             segmentation->MorePads(); 
             segmentation->NextPad()) 
        {
            qp=fResponse->IntXY(segmentation);
            qp=TMath::Abs(qp);
-           
 //
 //
            if (qp > 1.e-4) {
-               qcheck+=qp;
+               qcheck+=qp*qcath;
            //
            // --- store signal information
-               newclust[0][nnew]=qtot;                     // total charge
+               newclust[0][nnew]=qcath;                     // total charge
                newclust[1][nnew]=segmentation->Ix();       // ix-position of pad
                newclust[2][nnew]=segmentation->Iy();       // iy-position of pad
-               newclust[3][nnew]=qp * qtot;                // charge on pad
+               newclust[3][nnew]=qp * qcath;                // charge on pad
                newclust[4][nnew]=segmentation->ISector();  // sector id
                newclust[5][nnew]=(Float_t) i;              // counter
                nnew++;
+//             if (i==2) printf("\n i, nnew, q %d %d %f", i, nnew, qp*qcath);
+               
            }
        } // Pad loop
+       
     } // Cathode plane loop
 }