Backward compatibility using typedef, removing some debug printout

diff --git a/HMPID/AliHMPID.h b/HMPID/AliHMPID.h
index 89812cb7c9a597571d701fd47438d043d38cfafb..b7f3aef62255e5c89a39dd91cc340b06e3ff6f6a 100644 (file)
--- a/HMPID/AliHMPID.h
+++ b/HMPID/AliHMPID.h
@@ -59,5 +59,8 @@ protected:
 
   ClassDef(AliHMPID,11)                            //Main HMPID class 
 };//class AliHMPID  
+
+typedef AliHMPID AliRICH; // for backward compatibility
+
 //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 #endif

diff --git a/HMPID/AliHMPIDCluster.h b/HMPID/AliHMPIDCluster.h
index 99bebfea7dd69eff55623c592040d57cecc47dd9..77e9f95efd8bd5102379c3d1916abea7116dce22 100644 (file)
--- a/HMPID/AliHMPIDCluster.h
+++ b/HMPID/AliHMPIDCluster.h
@@ -44,6 +44,9 @@ protected:
   TObjArray    *fDigs;        //! list of digits forming this cluster
   ClassDef(AliHMPIDCluster,5)  //HMPID cluster class       
 };//class AliHMPIDCluster
+
+typedef AliHMPIDCluster AliRICHCluster; // for backward compatibility
+
 //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 void AliHMPIDCluster::DigAdd(AliHMPIDDigit *pDig)
 {

diff --git a/HMPID/AliHMPIDDigit.h b/HMPID/AliHMPIDDigit.h
index bf89f760bdcab1ae8cc725a0f9da6004cd31a1ee..d7e61cf6374b0d9eb47d589835af16c5b1b9fd18 100644 (file)
--- a/HMPID/AliHMPIDDigit.h
+++ b/HMPID/AliHMPIDDigit.h
@@ -76,6 +76,9 @@ protected:                  //AliDigit has fTracks[3]
   Float_t fQ;               //QDC value, fractions are permitted for summable procedure  
   ClassDef(AliHMPIDDigit,4) //HMPID digit class       
 };//class AliHMPIDDigitN
+
+typedef AliHMPIDDigit AliRICHDigit; // for backward compatibility
+
 //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 AliHMPIDDigit::AliHMPIDDigit(Int_t c,Float_t q,Int_t t,Float_t x,Float_t y,Int_t flag):AliDigit(),fPad(Abs(-1,-1,-1,-1)),fQ(-1)  
 {

diff --git a/HMPID/AliHMPIDDigitizer.h b/HMPID/AliHMPIDDigitizer.h
index 4ab8033f664d874f2f580df07469e43a5d94da5b..ee391724e7f4f8c51a49e72c0dd49740fc4e7ff5 100644 (file)
--- a/HMPID/AliHMPIDDigitizer.h
+++ b/HMPID/AliHMPIDDigitizer.h
@@ -21,4 +21,7 @@ public:
 protected:
   ClassDef(AliHMPIDDigitizer,0)
 };    
+
+typedef AliHMPIDDigitizer AliRICHDigitizer;  // for backward compatibility
+
 #endif

diff --git a/HMPID/AliHMPIDHelix.h b/HMPID/AliHMPIDHelix.h
index bd0db6299c6dda87f207b7312d04679dd008eeaa..7a07c6e5fc6f749a8920cceae9a8c6744358b361 100644 (file)
--- a/HMPID/AliHMPIDHelix.h
+++ b/HMPID/AliHMPIDHelix.h
@@ -25,6 +25,9 @@ protected:
   Float_t  fBz;            //magnetic field along z, [kGaus] 
   ClassDef(AliHMPIDHelix,0) //General helix
 };//class AliHMPIDHelix
+
+typedef AliHMPIDHelix AliRICHHelix; // for backward compatibility
+
 //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 void AliHMPIDHelix::Propagate(Float_t len,TVector3 &x,TVector3 &p)
 {

diff --git a/HMPID/AliHMPIDHit.h b/HMPID/AliHMPIDHit.h
index 3feeea81c6d861be20d0745ba9865081174406f3..dbf6bdd8ccfd5f6c3338abf2ac5b6894e53b1dec 100644 (file)
--- a/HMPID/AliHMPIDHit.h
+++ b/HMPID/AliHMPIDHit.h
@@ -31,5 +31,7 @@ protected:                                                                     /
   Float_t  fLorsY;                                                             //hit Y position in chamber LORS, [cm]
   ClassDef(AliHMPIDHit,4)                                                       //HMPID hit class 
 };//class AliHMPIDhit
+
+typedef AliHMPIDHit AliRICHHit; // for backward compatibility
     
 #endif

diff --git a/HMPID/AliHMPIDParam.cxx b/HMPID/AliHMPIDParam.cxx
index c264b6805a196086555ed32247ae7946f01f0d1e..c1ab26467d7d85fc4442e0d704b6f7ea8c50b60d 100644 (file)
--- a/HMPID/AliHMPIDParam.cxx
+++ b/HMPID/AliHMPIDParam.cxx
@@ -57,7 +57,7 @@ Int_t AliHMPIDParam::Stack(Int_t evt,Int_t tid)
   if(pAL->LoadKinematics()) return -1;
   
   Int_t mtid=-1;
-  Int_t iNevt=pAL->GetNumberOfEvents();     Printf("This session contains %i event(s)",iNevt);
+  Int_t iNevt=pAL->GetNumberOfEvents();
   
   for(Int_t iEvt=0;iEvt<iNevt;iEvt++){//events loop
     if(evt!=-1 && evt!=iEvt) continue; //in case one needs to print the requested event, ignore all others
@@ -74,7 +74,6 @@ Int_t AliHMPIDParam::Stack(Int_t evt,Int_t tid)
         pTrack=pStack->Particle(tid);
         str+=" from ";str+=pTrack->GetName();
       } 
-      Printf("%s",str.Data());       
     }//if(tid==-1)      
   }//events loop
   pAL->UnloadHeader();  pAL->UnloadKinematics();

diff --git a/HMPID/AliHMPIDParam.h b/HMPID/AliHMPIDParam.h
index 8b16361489fafc5c2d4c57de50b409add4dd01ae..1c6a40f69a9962dc0bfd627bc0cbfeaad5115014 100644 (file)
--- a/HMPID/AliHMPIDParam.h
+++ b/HMPID/AliHMPIDParam.h
@@ -41,6 +41,9 @@ protected:
   Float_t fY;                        //y shift of LORS with respect to rotated MARS   
   ClassDef(AliHMPIDParam,0)           //HMPID main parameters class
 };
+
+typedef AliHMPIDParam AliRICHParam; // for backward compatibility
+
 //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 AliHMPIDParam* AliHMPIDParam::Instance()
 {

diff --git a/HMPID/AliHMPIDPreprocessor.h b/HMPID/AliHMPIDPreprocessor.h
index 2648875e286d136cb31e66a7625e67ad8b3a80db..995ee69435d312567a111816749c0343c577e95f 100644 (file)
--- a/HMPID/AliHMPIDPreprocessor.h
+++ b/HMPID/AliHMPIDPreprocessor.h
@@ -16,4 +16,6 @@ protected:
   ClassDef(AliHMPIDPreprocessor, 0);
 };
 
+typedef AliHMPIDPreprocessor AliRICHPreprocessor; // for backward compatibility
+
 #endif

diff --git a/HMPID/AliHMPIDRecon.cxx b/HMPID/AliHMPIDRecon.cxx
index a005e4e0a1918891e3258a13003843882fb33fa1..2059c2772e93e77099dd0f62b7abfa10c5b45cb7 100644 (file)
--- a/HMPID/AliHMPIDRecon.cxx
+++ b/HMPID/AliHMPIDRecon.cxx
@@ -93,7 +93,6 @@ Double_t AliHMPIDRecon::FindPhotCkov(Double_t cluX,Double_t cluY)
 //   Returns: Cerenkov angle 
 
   TVector2 pos(cluX,cluY); Double_t cluR=(pos-fTrkPos).Mod();  Double_t phi=FindPhotPhi(cluX,cluY);      
-  Printf("new dist %f phi %f",cluR,phi);
   Double_t ckov1=0,ckov2=0.75;
   const Double_t kTol=0.05; 
   Int_t iIterCnt = 0;
@@ -101,7 +100,6 @@ Double_t AliHMPIDRecon::FindPhotCkov(Double_t cluX,Double_t cluY)
     if(iIterCnt>=50) return -1;
     Double_t ckov=0.5*(ckov1+ckov2);
     Double_t dist=cluR-TracePhot(ckov,phi,pos); iIterCnt++;   //get distance between trial point and cluster position
-    Printf("New: phi %f ckov %f dist %f",phi,ckov,dist);
     if     (dist> kTol) ckov1=ckov;                           //cluster @ larger ckov 
     else if(dist<-kTol) ckov2=ckov;                           //cluster @ smaller ckov
     else                return ckov;                          //precision achived         
@@ -412,7 +410,7 @@ void AliHMPIDRecon::Display()
     for(Int_t iTrk=0;iTrk<pEsd->GetNumberOfTracks();iTrk++){//ESD tracks loop
       AliESDtrack *pTrk = pEsd->GetTrack(iTrk);             //
       Float_t th,ph,x,y; pTrk->GetHMPIDtrk(x,y,th,ph); if(x<0) continue;
-      Int_t ch=pTrk->GetHMPIDcluIdx()/1000000; Printf("ch=%i",ch);
+      Int_t ch=pTrk->GetHMPIDcluIdx()/1000000;
       pTrkMap[ch]->SetPoint(aTrkCnt[ch]++,x,y);
     }//ESD tracks loop
     

diff --git a/HMPID/AliHMPIDRecon.h b/HMPID/AliHMPIDRecon.h
index 394995f94c6d764876608c5f9fab0541cd2b777e..bf0374d3b88abd814d81c9782f1e56aa53b3211b 100644 (file)
--- a/HMPID/AliHMPIDRecon.h
+++ b/HMPID/AliHMPIDRecon.h
@@ -66,6 +66,8 @@ protected:
   TVector2 fTrkPos;                           //track positon in LORS at the middle of radiator
   ClassDef(AliHMPIDRecon,0)
 };
+
+typedef AliHMPIDRecon AliRICHRecon; // for backward compatibility
     
 #endif // #ifdef AliHMPIDRecon_cxx
 

diff --git a/HMPID/AliHMPIDReconstructor.h b/HMPID/AliHMPIDReconstructor.h
index ccf3c1546dd3dc49b00c048cd93f4b2eaca0f4bb..b453c449938f5a44cd201cc7b8a091bb743ccad3 100644 (file)
--- a/HMPID/AliHMPIDReconstructor.h
+++ b/HMPID/AliHMPIDReconstructor.h
@@ -37,6 +37,9 @@ public:
   protected:
   ClassDef(AliHMPIDReconstructor, 0)   //class for the HMPID reconstruction
 };
+
+typedef AliHMPIDReconstructor AliRICHReconstructor; // for backward compatibility
+
 //__________________________________________________________________________________________________
 AliHMPIDDigit* AliHMPIDReconstructor::UseDig(Int_t padX,Int_t padY,TClonesArray *pDigLst,TMatrixF *pDigMap)
 {

diff --git a/HMPID/AliHMPIDTracker.cxx b/HMPID/AliHMPIDTracker.cxx
index 46a1da76b32aff23653f3f4164c372d266549b1f..41ef32f3de0b99ca3d340e7adafecad6b41b0cee 100644 (file)
--- a/HMPID/AliHMPIDTracker.cxx
+++ b/HMPID/AliHMPIDTracker.cxx
@@ -104,7 +104,6 @@ Int_t AliHMPIDTracker::PropagateBack(AliESD *pESD)
                    pTrk->SetHMPIDsignal   (recon.CkovAngle(pCluLst,iNphot));                 //search for Cerenkov angle for this track
                    pTrk->SetHMPIDchi2     (recon.CkovSigma2());                              //error squared 
                    pTrk->SetHMPIDmip      (pMipClu->X(),pMipClu->Y(),pMipClu->Q(),iMip);     //info on mip cluster + n. phot.
-    Printf("Ch=%i MIP-TRK=%5.2f cm Th=%f+-%f", iCh, dMin,pTrk->GetHMPIDsignal(),pTrk->GetHMPIDchi2());
  }//ESD tracks loop
   AliDebug(1,"Stop pattern recognition");
   return 0; // error code: 0=no error;

diff --git a/HMPID/AliHMPIDTracker.h b/HMPID/AliHMPIDTracker.h
index 116aec36a346c8e1887db2376d694d212cdf9dd6..7849eb00110ec9c4879f20ffed6fb8198da5b068 100644 (file)
--- a/HMPID/AliHMPIDTracker.h
+++ b/HMPID/AliHMPIDTracker.h
@@ -25,4 +25,6 @@ protected:
   ClassDef(AliHMPIDTracker,0)
 };//class AliHMPIDTracker
 
+typedef AliHMPIDTracker AliRICHTracker; // for backward compatibility
+
 #endif//AliHMPIDTracker_h

diff --git a/HMPID/AliHMPIDv0.h b/HMPID/AliHMPIDv0.h
index 085005414b3e95aa818802e3ac9470b1eed67c25..348254310157e7a0ebf033ea53f6666a9be02230 100644 (file)
--- a/HMPID/AliHMPIDv0.h
+++ b/HMPID/AliHMPIDv0.h
@@ -18,5 +18,7 @@ public:
 protected:
   ClassDef(AliHMPIDv0,1)  //HMPID coarse version for material budget study and debuging
 };
+
+typedef AliHMPIDv0 AliRICHv0; // for backward compatibility
        
 #endif

diff --git a/HMPID/AliHMPIDv1.h b/HMPID/AliHMPIDv1.h
index 33a8cc419e4ea479f48c0aa1d586a7cd5debea70..92dc5fd6caac0115f50cde532972323c2a569716 100644 (file)
--- a/HMPID/AliHMPIDv1.h
+++ b/HMPID/AliHMPIDv1.h
@@ -38,5 +38,7 @@ protected:
   Int_t fIdRad,fIdWin,fIdProxGap,fIdAmpGap,fIdPc,fIdAnod,fIdCath,fIdColl;              //! volumes ID's used in StepManager() and Count()
   ClassDef(AliHMPIDv1,2)                                                                //HMPID full version for simulation
 };
+
+typedef AliHMPIDv1 AliRICHv1; // for backward compatibility
                
 #endif

diff --git a/HMPID/HMPIDbaseLinkDef.h b/HMPID/HMPIDbaseLinkDef.h
index 3fe943c0cd810609231c42eb9f0b7794618a302c..14c0d9b3d29ab8a1f19380e7e3d00dea43bbfc2e 100644 (file)
--- a/HMPID/HMPIDbaseLinkDef.h
+++ b/HMPID/HMPIDbaseLinkDef.h
@@ -2,6 +2,14 @@
 #pragma link off all globals;
 #pragma link off all classes;
 #pragma link off all functions;
+
+#pragma link C++ typedef  AliRICHHelix;
+#pragma link C++ typedef  AliRICHDigit;
+#pragma link C++ typedef  AliRICHHit;
+#pragma link C++ typedef  AliRICHCluster;
+#pragma link C++ typedef  AliRICHParam;
+#pragma link C++ typedef  AliRICH;
+
 #pragma link C++ class  AliHMPIDHelix+;
 #pragma link C++ class  AliHMPIDDigit+;
 #pragma link C++ class  AliHMPIDHit+;

diff --git a/HMPID/HMPIDrecLinkDef.h b/HMPID/HMPIDrecLinkDef.h
index 35ddeedac67fc538d7469befd1d97101d1709234..1ba11d12d03583950183b1bab52fc377048591a4 100644 (file)
--- a/HMPID/HMPIDrecLinkDef.h
+++ b/HMPID/HMPIDrecLinkDef.h
@@ -2,6 +2,12 @@
 #pragma link off all globals;
 #pragma link off all classes;
 #pragma link off all functions;
+
+#pragma link C++ typedef  AliRICHReconstructor;
+#pragma link C++ typedef  AliRICHTracker;
+#pragma link C++ typedef  AliRICHRecon;
+#pragma link C++ typedef  AliRICHPreprocessor;
+
 #pragma link C++ class  AliHMPIDReconstructor+;
 #pragma link C++ class  AliHMPIDTracker+;
 #pragma link C++ class  AliHMPIDRecon+;

diff --git a/HMPID/HMPIDsimLinkDef.h b/HMPID/HMPIDsimLinkDef.h
index c54839b8c835ab5894ef413d304497f583e9bc81..060002ba2fa6263ac31d89295ed07148114c24fa 100644 (file)
--- a/HMPID/HMPIDsimLinkDef.h
+++ b/HMPID/HMPIDsimLinkDef.h
@@ -2,6 +2,11 @@
 #pragma link off all globals;
 #pragma link off all classes;
 #pragma link off all functions;
+
+#pragma link C++ typedef  AliRICHv0;
+#pragma link C++ typedef  AliRICHv1;
+#pragma link C++ typedef  AliRICHDigitizer;
+
 #pragma link C++ class  AliHMPIDv0+;
 #pragma link C++ class  AliHMPIDv1+;
 #pragma link C++ class  AliHMPIDDigitizer+;