Remove fortran functions
authormartinez <martinez@f7af4fe6-9843-0410-8265-dc069ae4e863>
Wed, 6 Apr 2005 09:13:21 +0000 (09:13 +0000)
committermartinez <martinez@f7af4fe6-9843-0410-8265-dc069ae4e863>
Wed, 6 Apr 2005 09:13:21 +0000 (09:13 +0000)
Including dummy methods for overloading warnings
(Christian)

MUON/AliMUONClusterFinderAZ.h
MUON/AliMUONTrackK.cxx
MUON/AliMUONTrackParam.cxx
MUON/AliMUONTrackParam.h
MUON/libMUONrec.pkg

index 706ed30..5ac3449 100644 (file)
@@ -85,6 +85,13 @@ protected:
   Int_t FindLocalMaxima(Int_t *localMax, Double_t *maxVal); // find local maxima 
   void  FlagLocalMax(TH2D *hist, Int_t i, Int_t j, Int_t *isLocalMax); // flag local max
   void  FindCluster(Int_t *localMax, Int_t iMax); // find cluster around local max
+
+  // dummy method for overloading warnings
+  void FindCluster(int, int, int, AliMUONRawCluster&) {return;}
+  void FindLocalMaxima(AliMUONRawCluster*) {return;}
+  void Split(AliMUONRawCluster*) {return;}
+  void AddRawCluster(const AliMUONRawCluster&) {return;}
+
   // This function is used for fitting
   void  Fcn1(Int_t &npar, Double_t *gin, Double_t &f, Double_t *par, Int_t iflag);
 
index 4f83b76..fed6f21 100644 (file)
@@ -44,39 +44,6 @@ void mnvertLocalK(Double_t* a, Int_t l, Int_t m, Int_t n, Int_t& ifail);
 
 ClassImp(AliMUONTrackK) // Class implementation in ROOT context
 
-  // A few calls in Fortran or from Fortran (extrap.F).
-#ifndef WIN32 
-# define extrap_onestep_helix extrap_onestep_helix_
-# define extrap_onestep_helix3 extrap_onestep_helix3_
-# define extrap_onestep_rungekutta extrap_onestep_rungekutta_
-# define gufld_double gufld_double_
-#else 
-# define extrap_onestep_helix EXTRAP_ONESTEP_HELIX
-# define extrap_onestep_helix3 EXTRAP_ONESTEP_HELIX3
-# define extrap_onestep_rungekutta EXTRAP_ONESTEP_RUNGEKUTTA
-# define gufld_double GUFLD_DOUBLE
-#endif 
-
-extern "C" {
-  void type_of_call extrap_onestep_helix
-  (Double_t &Charge, Double_t &StepLength, Double_t *VGeant3, Double_t *VGeant3New);
-
-  void type_of_call extrap_onestep_helix3
-  (Double_t &Field, Double_t &StepLength, Double_t *VGeant3, Double_t *VGeant3New);
-
-  void type_of_call extrap_onestep_rungekutta
-  (Double_t &Charge, Double_t &StepLength, Double_t *VGeant3, Double_t *VGeant3New);
-
-  void type_of_call gufld_double(Double_t *Position, Double_t *Field) {
-    //interface to "gAlice->Field()->Field" for arguments in double precision
-    Float_t x[3], b[3];
-    x[0] = Position[0]; x[1] = Position[1]; x[2] = Position[2];
-    gAlice->Field()->Field(x, b);
-    Field[0] = b[0]; Field[1] = b[1]; Field[2] = b[2];
-  }
-    
-}
-
 Int_t AliMUONTrackK::fgDebug = -1;
 Int_t AliMUONTrackK::fgNOfPoints = 0; 
 AliMUON* AliMUONTrackK::fgMUON = NULL;
@@ -656,7 +623,7 @@ void AliMUONTrackK::ParPropagation(Double_t zEnd)
   Int_t iFB, nTries;
   Double_t dZ, step, distance, charge;
   Double_t vGeant3[7], vGeant3New[7];
-
+  AliMUONTrackParam* trackParam = 0;
   nTries = 0;
   // First step using linear extrapolation
   dZ = zEnd - fPosition;
@@ -673,7 +640,8 @@ void AliMUONTrackK::ParPropagation(Double_t zEnd)
   do {
     step = TMath::Abs(step);
     // Propagate parameters
-    extrap_onestep_rungekutta(charge,step,vGeant3,vGeant3New);
+    trackParam->ExtrapOneStepRungekutta(charge,step,vGeant3,vGeant3New);
+    //    extrap_onestep_rungekutta(charge,step,vGeant3,vGeant3New);
     distance = zEnd - vGeant3New[2];
     step *= dZ/(vGeant3New[2]-fPositionNew);
     nTries ++;
@@ -691,7 +659,9 @@ void AliMUONTrackK::ParPropagation(Double_t zEnd)
     do {
       // binary search
       // Propagate parameters
-      extrap_onestep_rungekutta(charge,step,vGeant3,vGeant3New);
+      //   extrap_onestep_rungekutta(charge,step,vGeant3,vGeant3New);
+      trackParam->ExtrapOneStepRungekutta(charge,step,vGeant3,vGeant3New);
+
       distance = zEnd - vGeant3New[2];
       step /= 2;
       nTries ++;
index bc91e6d..ddd751c 100644 (file)
@@ -542,7 +542,7 @@ Double_t AliMUONTrackParam::P()
 }
  //__________________________________________________________________________
 void AliMUONTrackParam::ExtrapOneStepHelix(Double_t charge, Double_t step, 
-                                        Double_t *vect, Double_t *vout) 
+                                        Double_t *vect, Double_t *vout) const
 {
 //    ******************************************************************
 //    *                                                                *
@@ -661,7 +661,7 @@ void AliMUONTrackParam::ExtrapOneStepHelix(Double_t charge, Double_t step,
 
  //__________________________________________________________________________
 void AliMUONTrackParam::ExtrapOneStepHelix3(Double_t field, Double_t step, 
-                                              Double_t *vect, Double_t *vout)
+                                              Double_t *vect, Double_t *vout) const
 {
 // 
 //     ******************************************************************
@@ -739,7 +739,7 @@ void AliMUONTrackParam::ExtrapOneStepHelix3(Double_t field, Double_t step,
 }
  //__________________________________________________________________________
 void AliMUONTrackParam::ExtrapOneStepRungekutta(Double_t charge, Double_t step, 
-                                                    Double_t* vect, Double_t* vout)
+                                                    Double_t* vect, Double_t* vout) const
 {
 // 
 //     ******************************************************************
@@ -984,7 +984,7 @@ void AliMUONTrackParam::ExtrapOneStepRungekutta(Double_t charge, Double_t step,
     return;
 }
 //___________________________________________________________
- void  AliMUONTrackParam::GetField(Double_t *Position, Double_t *Field) 
+ void  AliMUONTrackParam::GetField(Double_t *Position, Double_t *Field) const
 {
     // interface to "gAlice->Field()->Field" for arguments in double precision
 
index a20daea..8eda2da 100644 (file)
@@ -46,6 +46,13 @@ class AliMUONTrackParam : public TObject
   Double_t TotalMomentumEnergyLoss(Double_t thetaLimit, Double_t pTotal, Double_t theta);
   void FieldCorrection(Double_t Z); // makes simple magnetic field correction through the absorber 
 
+  void ExtrapOneStepHelix(Double_t charge, Double_t step, 
+                         Double_t *vect, Double_t *vout) const;
+  void ExtrapOneStepHelix3(Double_t field, Double_t step, 
+                          Double_t *vect, Double_t *vout) const;
+
+  void ExtrapOneStepRungekutta(Double_t charge, Double_t step, 
+                              Double_t* vect, Double_t* vout) const;
  protected:
  private:
   Double_t fInverseBendingMomentum; // Inverse bending momentum (GeV/c ** -1) times the charge (assumed forward motion)
@@ -57,15 +64,8 @@ class AliMUONTrackParam : public TObject
 
   void SetGeant3Parameters(Double_t *VGeant3, Double_t ForwardBackward);
   void GetFromGeant3Parameters(Double_t *VGeant3, Double_t Charge);
-  void ExtrapOneStepHelix(Double_t charge, Double_t step, 
-                         Double_t *vect, Double_t *vout);
-  void ExtrapOneStepHelix3(Double_t field, Double_t step, 
-                          Double_t *vect, Double_t *vout);
-
-  void ExtrapOneStepRungekutta(Double_t charge, Double_t step, 
-                              Double_t* vect, Double_t* vout);
 
-  void GetField(Double_t *Position, Double_t *Field);
+  void GetField(Double_t *Position, Double_t *Field) const;
 
   ClassDef(AliMUONTrackParam, 1) // Track parameters in ALICE dimuon spectrometer
     };
index 9c384ee..7b9dc98 100644 (file)
@@ -1,7 +1,5 @@
 # $Id$
 
-FSRCS= extrap.F
-
 SRCS:= AliMUONClusterReconstructor.cxx \
        AliMUONClusterFinderVS.cxx \
        AliMUONClusterFinderAZ.cxx \