AliPHOSCPVHit inherits from AliHit

diff --git a/PHOS/AliPHOSAnalyze.cxx b/PHOS/AliPHOSAnalyze.cxx
index 6dbf7b8381570f2e5317120c7351fd89d0a0fd58..26477811c5116ba31ee23e9bed8eacc2ab9c2fad 100644 (file)
--- a/PHOS/AliPHOSAnalyze.cxx
+++ b/PHOS/AliPHOSAnalyze.cxx
@@ -416,8 +416,8 @@ void AliPHOSAnalyze::ReadAndPrintCPV(Int_t EvFirst, Int_t EvLast)
          nGenHits++;
          cpvHit = (AliPHOSCPVHit*)cpvHits->UncheckedAt(ihit);
          p      = cpvHit->GetMomentum();
-         xgen   = cpvHit->GetX();
-         zgen   = cpvHit->GetY();
+         xgen   = cpvHit->X();
+         zgen   = cpvHit->Y();
          ipart  = cpvHit->GetIpart();
          printf("CPV hit in module %d: ",iModule+1);
          printf(" p = (%f, %f, %f, %f) GeV,\n",
@@ -512,8 +512,8 @@ void AliPHOSAnalyze::AnalyzeCPV(Int_t Nevents)
        for (Int_t ihit=0; ihit<nCPVhits; ihit++) {
          cpvHit   = (AliPHOSCPVHit*)cpvHits->UncheckedAt(ihit);
          p        = cpvHit->GetMomentum();
-         xzgen[0] = cpvHit->GetX();
-         xzgen[1] = cpvHit->GetY();
+         xzgen[0] = cpvHit->X();
+         xzgen[1] = cpvHit->Y();
          ipart    = cpvHit->GetIpart();
          TClonesArray &lhits = *(TClonesArray *)hitsPerModule[iModule];
          new(lhits[hitsPerModule[iModule]->GetEntriesFast()]) AliPHOSCPVHit(*cpvHit);
@@ -555,8 +555,8 @@ void AliPHOSAnalyze::AnalyzeCPV(Int_t Nevents)
       Int_t nCPVhits  = cpvHits->GetEntriesFast();
       for (Int_t ihit=0; ihit<nCPVhits; ihit++) {
        cpvHit = (AliPHOSCPVHit*)cpvHits->UncheckedAt(ihit);
-       xgen   = cpvHit->GetX();
-       zgen   = cpvHit->GetY();
+       xgen   = cpvHit->X();
+       zgen   = cpvHit->Y();
        r2 = TMath::Power((xgen-xrec),2) + TMath::Power((zgen-zrec),2);
        if ( r2 < r2min ) {
          r2min = r2;

diff --git a/PHOS/AliPHOSCPVHit.cxx b/PHOS/AliPHOSCPVHit.cxx
index ac978188fece237ddc3e3f4bad7d3ffdc4b8c4f4..3fcd5cdc3b471d9f3bc4b0753729a289c7c02c6e 100644 (file)
--- a/PHOS/AliPHOSCPVHit.cxx
+++ b/PHOS/AliPHOSCPVHit.cxx
@@ -15,6 +15,9 @@
 
 /*
   $Log$
+  Revision 1.1  2000/11/03 16:49:53  schutz
+  New class AliPHOSCPVHit
+
 */
 
 ////////////////////////////////////////////////
@@ -38,15 +41,16 @@ ClassImp(AliPHOSCPVHit)
 
 //______________________________________________________________________________
 
-AliPHOSCPVHit::AliPHOSCPVHit(TLorentzVector p, Float_t *xy, Int_t ipart)
+AliPHOSCPVHit::AliPHOSCPVHit(Int_t shunt, Int_t track, TLorentzVector p, Float_t *xy, Int_t ipart)
+             : AliHit(shunt, track)
 {
   //
   // Create a CPV hit object
   //
 
   fMomentum  = p;
-  fXhit      = xy[0];
-  fYhit      = xy[1];
+  fX         = xy[0];
+  fY         = xy[1];
   fIpart     = ipart;
 }
 
@@ -58,7 +62,7 @@ void AliPHOSCPVHit::Print()
   //
 
   printf("CPV hit: p  = (% .4f, % .4f, % .4f, % .4f) GeV,\n",
-       GetMomentum().Px(),GetMomentum().Py(),GetMomentum().Pz(),GetMomentum().E());
+       fMomentum.Px(),fMomentum.Py(),fMomentum.Pz(),fMomentum.E());
   printf("         xy = (%8.4f, %8.4f) cm, ipart = %d\n",
-        fXhit,fYhit,fIpart);
+        fX,fY,fIpart);
 }

diff --git a/PHOS/AliPHOSCPVHit.h b/PHOS/AliPHOSCPVHit.h
index 7e9e8f0d4480c08c37d22e28e2b29fb4ee7bc681..55e51e50f67669f2fd9e38873b32096ccc2ddd0b 100644 (file)
--- a/PHOS/AliPHOSCPVHit.h
+++ b/PHOS/AliPHOSCPVHit.h
@@ -17,28 +17,25 @@
 #include <TLorentzVector.h>
 
 // --- galice header files ---
+#include <AliHit.h>
 
 //==============================================================================
 //                              AliPHOSCPVHit
 //==============================================================================
 
-class AliPHOSCPVHit : public TObject {
+class AliPHOSCPVHit : public AliHit {
   
 public:
   virtual ~AliPHOSCPVHit() {}
            AliPHOSCPVHit() {}
-           AliPHOSCPVHit(TLorentzVector p, Float_t *xy, Int_t ipart);
+           AliPHOSCPVHit(Int_t shunt, Int_t track, TLorentzVector p, Float_t *xy, Int_t ipart);
   
   TLorentzVector GetMomentum()  { return  fMomentum; }
-  Float_t        GetX()         { return  fXhit;     }
-  Float_t        GetY()         { return  fYhit;     }
   Int_t          GetIpart()     { return  fIpart;    }
   void           Print();
 
 private:
   TLorentzVector fMomentum;   // 4-momentum of the particle
-  Float_t        fXhit;       // Hit's X-coordinates
-  Float_t        fYhit;       // Hit's Y-coordinates
   Int_t          fIpart;      // Hit's particle type
   
   ClassDef(AliPHOSCPVHit,1)  // Hit object in one CPV module

diff --git a/PHOS/AliPHOSCPVModule.cxx b/PHOS/AliPHOSCPVModule.cxx
index 7c53091e013a2961422feeae934619a2bebbb0e0..4e73945e2c0bffbaf1134cc081fcb8ce28041f70 100644 (file)
--- a/PHOS/AliPHOSCPVModule.cxx
+++ b/PHOS/AliPHOSCPVModule.cxx
@@ -15,6 +15,9 @@
 
 /*
   $Log$
+  Revision 1.3  2000/11/13 11:45:36  schutz
+  DEC and HP compilers sufisfied
+
   Revision 1.2  2000/11/13 09:34:11  martinez
   Copy constructor and operator = changed
 
@@ -110,14 +113,14 @@ void AliPHOSCPVModule::Clear(Option_t *opt)
 
 //______________________________________________________________________________
 
-void AliPHOSCPVModule::AddHit(TLorentzVector p, Float_t *xy, Int_t ipart)
+void AliPHOSCPVModule::AddHit(Int_t shunt, Int_t track, TLorentzVector p, Float_t *xy, Int_t ipart)
 {
   //
   // Add this hit to the hit list in CPV detector.
   //
 
   TClonesArray &lhits = *(TClonesArray *)fHits;
-  new(lhits[fHits->GetEntriesFast()]) AliPHOSCPVHit(p,xy,ipart);
+  new(lhits[fHits->GetEntriesFast()]) AliPHOSCPVHit(shunt,track,p,xy,ipart);
 }
 
 //______________________________________________________________________________

diff --git a/PHOS/AliPHOSCPVModule.h b/PHOS/AliPHOSCPVModule.h
index f3198ecf64b43f965b6b589c7f388d183dcf0b30..82f44f04f932c8e5200e8df901918b75bdee28a2 100644 (file)
--- a/PHOS/AliPHOSCPVModule.h
+++ b/PHOS/AliPHOSCPVModule.h
@@ -34,7 +34,7 @@ public:
   void     Copy(AliPHOSCPVModule &module) const;
   void     Clear(Option_t *opt="");
   void     Print(Option_t *opt="");
-  void     AddHit(TLorentzVector p, Float_t *xy, Int_t ipart);
+  void     AddHit(Int_t shunt, Int_t track, TLorentzVector p, Float_t *xy, Int_t ipart);
   void     MakeBranch(Int_t i);
   void     SetTreeAddress(Int_t i);
   

diff --git a/PHOS/AliPHOSv1.cxx b/PHOS/AliPHOSv1.cxx
index f9b02cea84619c1e89619aadbac6997fa3ca71e3..2f51c43c9c45905b38c551e78a9ba4d1cbdcc6fb 100644 (file)
--- a/PHOS/AliPHOSv1.cxx
+++ b/PHOS/AliPHOSv1.cxx
@@ -584,7 +584,7 @@ void AliPHOSv1::StepManager(void)
 
       // Add the current particle in the list of the CPV hits.
 
-      phos.GetCPVModule(moduleNumber).AddHit(pmom,xyd,ipart);
+      phos.GetCPVModule(moduleNumber).AddHit(fIshunt,tracknumber,pmom,xyd,ipart);
 
       if (fDebugLevel == 1) {
        printf("CPV hit added to module #%2d: p = (% .4f, % .4f, % .4f, % .4f) GeV,\n",

diff --git a/PHOS/Makefile b/PHOS/Makefile
index a1dda2fff7c3d7b0d7e6b858cc51faf155964343..4a510110924130e384e12a4593fb3f62e6a06f16 100644 (file)
--- a/PHOS/Makefile
+++ b/PHOS/Makefile
@@ -6,6 +6,7 @@ include $(ALICE_ROOT)/conf/GeneralDef
 include $(ALICE_ROOT)/conf/MachineDef.$(ALICE_TARGET)
 
 PACKAGE = PHOS
+MYLIBDIR = ~/lib/tgt_$(ALICE_TARGET)
 
 # C++ sources
 
@@ -51,11 +52,11 @@ ALOBJS  = $(SHOBJS) $(RCOBJS) $(DUOBJS)
 
 ##### COMMANDS ##### 
 
-SLIBRARY       = $(LIBDIR)/libPHOS.$(SL)
+SLIBRARY       = $(MYLIBDIR)/libPHOS.$(SL)
 
 default:       $(SLIBRARY)
 
-$(LIBDIR)/libPHOS.$(SL):                       $(OBJS) $(FOBJS)
+$(MYLIBDIR)/libPHOS.$(SL):                     $(OBJS) $(FOBJS)
 
 $(DICT):                                       $(HDRS)