Minor syntax for the Alpha OSF

diff --git a/MUON/AliMUON.cxx b/MUON/AliMUON.cxx
index 3987e22b7aef1b55e0a77cb2dfd9dfa4149f00dc..38d692e63a507c93264a670ef194ba90ad482318 100644 (file)
--- a/MUON/AliMUON.cxx
+++ b/MUON/AliMUON.cxx
@@ -15,6 +15,9 @@
 
 /*
 $Log$
+Revision 1.10  1999/10/01 09:24:40  fca
+Protect against no current file in FinishEvent
+
 Revision 1.9  1999/09/29 09:24:20  fca
 Introduction of the Copyright and cvs Log
 
@@ -122,6 +125,19 @@ void type_of_call fcnfit(Int_t &, Double_t *, Double_t &, Double_t *, Int_t &, I
 Float_t type_of_call rndm() {return gRandom->Rndm();}
 }
 
+void fcnfwrap(Int_t &i1, Double_t *d1, Double_t &d2,
+       Double_t *d3, Int_t i2)
+{
+   fcnf(i1,d1,d2,d3,i2);
+}
+
+void fcnfitfwrap(Int_t &i1, Double_t *d1, Double_t &d2,
+       Double_t *d3, Int_t i2)
+{
+   fcnfitf(i1,d1,d2,d3,i2);
+}
+
+
 // Static variables for the pad-hit iterator routines
 static Int_t sMaxIterPad=0;
 static Int_t sCurIterPad=0;
@@ -2848,7 +2864,7 @@ void trackf_fit(Int_t &ivertex, Double_t *pest, Double_t *pstep, Double_t &pxzin
   
   TMinuit *gMinuit = new TMinuit(5);
   gMinuit->mninit(5,10,7);
-  gMinuit->SetFCN(fcnf);  // constant m.f.
+  gMinuit->SetFCN(fcnfwrap);  // constant m.f.
 
   arglist[0] = -1;
   
@@ -2905,7 +2921,7 @@ void prec_fit(Double_t &pxzinv, Double_t &fis, Double_t &alams, Double_t &xvert,
       
       TMinuit *gMinuit = new TMinuit(5);
       gMinuit->mninit(5,10,7);
-      gMinuit->SetFCN(fcnfitf);
+      gMinuit->SetFCN(fcnfitfwrap);
 
       arglist[0] = -1.;
       gMinuit->mnexcm("SET PRINT", arglist, 1, ierflg);

diff --git a/MUON/AliMUONSegResV01.h b/MUON/AliMUONSegResV01.h
index 4d25594c07b9f63f3a43c3810b278de07a93b20c..e2ae2ad001c111a586eabec9a8826d1659101fb5 100644 (file)
--- a/MUON/AliMUONSegResV01.h
+++ b/MUON/AliMUONSegResV01.h
@@ -39,6 +39,10 @@ public AliMUONsegmentationV0 {
     //
     // Get member data
     //
+    // Pad size in x
+    virtual Float_t Dpx(){return AliMUONsegmentationV0::Dpx();}
+    // Pad size in y
+    virtual Float_t Dpy(){return AliMUONsegmentationV0::Dpy();}
     // Pad size in x by Sector
     virtual Float_t Dpx(Int_t isec);
     // Pad size in y by Sector

diff --git a/MUON/reco_muon.F b/MUON/reco_muon.F
index e7e0a0950a34317fefdeceded63adac56d5e059c..601106eb016dd5a64c5ecb9a7f274b313c3e312a 100644 (file)
--- a/MUON/reco_muon.F
+++ b/MUON/reco_muon.F
@@ -2343,9 +2343,9 @@
                PXZR = SQRT( PXR(ITR)**2+PZR(ITR)**2) 
                PRINT *,' PXZ GEANT= ', PXZV,' PXZ RECONS= ',PXZR
                FIV=ATAN2(PYV(ITR),PZV(ITR))
-               ALAMV=ATAN2(PXV(ITR),PXZV)
+               ALAMV=ATAN2(DBLE(PXV(ITR)),PXZV)
                FIR=ATAN2(PXR(ITR),PZR(ITR))
-               ALAMR=ATAN2(PYR(ITR),PXZR)
+               ALAMR=ATAN2(DBLE(PYR(ITR)),PXZR)
 **               PRINT *,' PHI GEANT= ',FIV,' PXZ RECONS= ',FIR
 **               PRINT *,' ALAM GEANT= ',ALAMV,' ALAM RECONS= ',ALAMR
           ENDDO
@@ -3597,6 +3597,9 @@
 * $Id$
 *
 * $Log$
+* Revision 1.2  1999/08/06 14:12:30  fca
+* Remove several warnings
+*
 * Revision 1.1  1999/07/30 10:53:20  fca
 * New version of MUON from M.Bondila & A.Morsch
 *

diff --git a/RICH/AliRICHv0.cxx b/RICH/AliRICHv0.cxx
index 540f03aa21b94140b2af09eadfae8576434bc367..0d5a1aee018c835d80b3ae1089e16c514b459b42 100644 (file)
--- a/RICH/AliRICHv0.cxx
+++ b/RICH/AliRICHv0.cxx
@@ -15,6 +15,9 @@
 
 /*
 $Log$
+Revision 1.3  1999/09/29 09:24:29  fca
+Introduction of the Copyright and cvs Log
+
 */
 
 /////////////////////////////////////////////////////////
@@ -449,7 +452,7 @@ void AliRICHv0::StepManager()
     static Int_t   idvol;
     static Int_t   vol[2];
     Int_t          ipart;
-    static Float_t hits[9];
+    static Float_t hits[10];
     TLorentzVector Position;
     TLorentzVector Momentum;
     Float_t        pos[3];

diff --git a/TPC/AliTPCPRF2D.cxx b/TPC/AliTPCPRF2D.cxx
index 58e739d5990a87f67250e699a8ef15a344032b0f..57b073bc3c553f2a183686d2a86f036dd6e94765 100644 (file)
--- a/TPC/AliTPCPRF2D.cxx
+++ b/TPC/AliTPCPRF2D.cxx
@@ -15,6 +15,9 @@
 
 /*
 $Log$
+Revision 1.2  1999/09/29 09:24:34  fca
+Introduction of the Copyright and cvs Log
+
 */
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -203,7 +206,6 @@ Float_t AliTPCPRF2D::GetPRF(Float_t xin, Float_t yin, Bool_t inter)
        //Float_t res = z1*(1-dy)+z2*dy;
     return res;            
   }        
-  return 0.;
 }