Retagging v4-18-07-AN

sevdokim · Oct 13, 2009 · 89c9c61 · 89c9c61
2 parents 6ff2e37 + 0673af5
commit 89c9c61
Show file tree

Hide file tree

Showing 8 changed files with 41 additions and 17 deletions.
diff --git a/MUON/AliMUONCalibParamNF.cxx b/MUON/AliMUONCalibParamNF.cxx
@@ -23,6 +23,8 @@
 #include "TMath.h"
 #include "TString.h"
 
+#include <limits.h>
+
 //-----------------------------------------------------------------------------
 /// \class AliMUONCalibParamNF
 ///
@@ -280,6 +282,13 @@ AliMUONCalibParamNF::ValueAsInt(Int_t i, Int_t j) const
 /// Return the value as an int, by rounding the internal float value.
 
   Float_t v = ValueAsFloat(i,j);
+
+  if ( v >= Float_t(INT_MAX) ) {
+    AliErrorStream() 
+      << "Cannot convert value " << v << " to Int_t." << endl;
+    return 0;
+  }  
+
   return TMath::Nint(v);
 }
 

diff --git a/MUON/AliMUONQADataMakerRec.cxx b/MUON/AliMUONQADataMakerRec.cxx
@@ -1765,7 +1765,7 @@ AliMUONQADataMakerRec::BeautifyTrackerBusPatchOccupancy(TH1& hbp)
     // computed the truncated mean of the occupancy values, in order to get a 
     // reasonable y-range for the histogram (without giant peaks to the roof 
     // for misbehaving buspatches).
-    ok = trim(nBusPatches,x,alpha,tmean,tvar,ymin,ymax);
+    ok = trim(n,x,alpha,tmean,tvar,ymin,ymax);
 
     delete[] x;
   }

diff --git a/PWG4/GammaConv/AliV0Reader.cxx b/PWG4/GammaConv/AliV0Reader.cxx
@@ -293,7 +293,7 @@ Bool_t AliV0Reader::NextV0(){
       fCFManager->GetParticleContainer()->Fill(containerInput,kStepTPCPID);			// for CF
     }
 
-
+    /*		
     if(fUseOwnXYZCalculation == kFALSE){
       fCurrentV0->GetXYZ(fCurrentXValue,fCurrentYValue,fCurrentZValue);
     }
@@ -306,7 +306,7 @@ Bool_t AliV0Reader::NextV0(){
       fCurrentYValue = convpos[1];
       fCurrentZValue = GetConvPosZ(GetPositiveESDTrack(),GetNegativeESDTrack(),GetMagneticField());
     }
-		
+    */	
     if(GetXYRadius()>fMaxR){ // cuts on distance from collision point
       if(fHistograms != NULL){
 	fHistograms->FillHistogram("ESD_CutR_InvMass",GetMotherCandidateMass());
@@ -611,6 +611,20 @@ Bool_t AliV0Reader::HasSameMCMother(){
 	}
     }
   }
+
+  if(fUseOwnXYZCalculation == kFALSE){
+    fCurrentV0->GetXYZ(fCurrentXValue,fCurrentYValue,fCurrentZValue);
+  }
+  else{
+    Double_t convpos[2];
+    convpos[0]=0;
+    convpos[1]=0;
+    GetConvPosXY(GetPositiveESDTrack(),GetNegativeESDTrack(),GetMagneticField(),convpos);
+    fCurrentXValue = convpos[0];
+    fCurrentYValue = convpos[1];
+    fCurrentZValue = GetConvPosZ(GetPositiveESDTrack(),GetNegativeESDTrack(),GetMagneticField());
+  }
+
   return iResult;
 }
 

diff --git a/STEER/AliQADataMaker.h b/STEER/AliQADataMaker.h
@@ -51,6 +51,7 @@ class AliQADataMaker: public TNamed {
 	virtual void        Exec(AliQAv1::TASKINDEX_t, TObject * data)             = 0 ;
 	virtual void        EndOfCycle()                                           = 0 ;
 	virtual void        EndOfCycle(AliQAv1::TASKINDEX_t )                      = 0 ;
+	virtual void        EndOfDetectorCycle(AliQAv1::TASKINDEX_t task, TObjArray ** list ) = 0 ; 
 	void                Finish() const ; 
 	virtual TH1 *       GetDigitsData(const Int_t index)                       = 0 ; 
 	virtual TH1 *       GetESDsData(const Int_t index)                         = 0 ; 
@@ -87,7 +88,6 @@ class AliQADataMaker: public TNamed {
 	Int_t          Add2List(TH1 * hist, const Int_t index, TObjArray ** list, const Bool_t expert = kFALSE, const Bool_t image = kFALSE, const Bool_t saveForCorr = kFALSE) ;
   TH1 *          CloneMe(TH1 * hist, Int_t specie) const ; 
 	virtual void   DefaultEndOfDetectorCycle(AliQAv1::TASKINDEX_t task ) ; 
-	virtual void   EndOfDetectorCycle(AliQAv1::TASKINDEX_t task, TObjArray ** list ) = 0 ; 
 	TObject *      GetData(TObjArray ** list, const Int_t index) ;
 	virtual void   InitDigits()        = 0 ; 
 	virtual void   InitESDs()          = 0 ; 

diff --git a/T0/AliT0DataDCS.cxx b/T0/AliT0DataDCS.cxx
@@ -36,6 +36,7 @@ Preliminary test version (T.Malkiewicz)
 #include <TDatime.h>
 #include <TStyle.h>
 #include <TCanvas.h>
+#include <iostream>
 
 // AliT0DataDCS class
 // declaring DCS aliases for T0
@@ -284,7 +285,7 @@ Bool_t AliT0DataDCS::ProcessData(TMap& aliasMap)
 		   t0_c_hv_imon[k]=0.;
                    t0_c_hv_vmon[k]=0.;
                 }
-		for(Int_t k=0; k<kHV; k++)
+		for(Int_t k=0; k<kLV; k++)
                 {
                    t0_a_lv_imon[k]=0.;
                    t0_a_lv_vmon[k]=0.;

diff --git a/TOF/AliTOFtracker.cxx b/TOF/AliTOFtracker.cxx
@@ -402,16 +402,16 @@ void AliTOFtracker::MatchTracks( Bool_t mLastStep){
 
     if (cov[0]<0. || cov[2]<0.) {
       AliWarning(Form("Very strange track (%d)! At least one of its covariance matrix diagonal elements is negative!",iseed));
-      delete trackTOFin;
-      continue;
+      //delete trackTOFin;
+      //continue;
     }
 
     Double_t dphi=
       scaleFact*
-      ((5*TMath::Sqrt(cov[0]) + 0.5*dY + 2.5*TMath::Abs(par[2]))/sensRadius); 
+      ((5*TMath::Sqrt(TMath::Abs(cov[0])) + 0.5*dY + 2.5*TMath::Abs(par[2]))/sensRadius); 
     Double_t dz=
        scaleFact*
-       (5*TMath::Sqrt(cov[2]) + 0.5*dZ + 2.5*TMath::Abs(par[3]));
+       (5*TMath::Sqrt(TMath::Abs(cov[2])) + 0.5*dZ + 2.5*TMath::Abs(par[3]));
 
     Double_t phi=TMath::ATan2(par[0],x) + trackTOFin->GetAlpha();
     if (phi<-TMath::Pi())phi+=2*TMath::Pi();

diff --git a/TOF/AliTOFtrackerMI.cxx b/TOF/AliTOFtrackerMI.cxx
@@ -354,17 +354,17 @@ void AliTOFtrackerMI::MatchTracksMI(Bool_t mLastStep){
 
     if (cov[0]<0. || cov[2]<0.) {
       AliWarning(Form("Very strange track (%d)! At least one of its covariance matrix diagonal elements is negative!",i));
-      delete trackTOFin;
-      continue;
+      //delete trackTOFin;
+      //continue;
     }
 
     Float_t scalefact=3.;    
     Double_t dphi=
       scalefact*
-      ((5*TMath::Sqrt(cov[0]) + 3.*fDy + 10.*TMath::Abs(par[2]))/fR); 
+      ((5*TMath::Sqrt(TMath::Abs(cov[0])) + 3.*fDy + 10.*TMath::Abs(par[2]))/fR); 
     Double_t dz=
       scalefact*
-      (5*TMath::Sqrt(cov[2]) + 3.*fDz + 10.*TMath::Abs(par[3]));
+      (5*TMath::Sqrt(TMath::Abs(cov[2])) + 3.*fDz + 10.*TMath::Abs(par[3]));
 
     Double_t phi=TMath::ATan2(par[0],x) + trackTOFin->GetAlpha();
     if (phi<-TMath::Pi())phi+=2*TMath::Pi();

diff --git a/TOF/AliTOFtrackerV1.cxx b/TOF/AliTOFtrackerV1.cxx
@@ -347,13 +347,13 @@ void AliTOFtrackerV1::MatchTracks( ){
 
     if (cov[0]<0. || cov[2]<0.) {
       AliWarning(Form("Very strange track (%d)! At least one of its covariance matrix diagonal elements is negative!",iseed));
-      delete trackTOFin;
-      continue;
+      //delete trackTOFin;
+      //continue;
     }
 
     Double_t z    = par[1];   
-    Double_t dz   =  scaleFact*3.*TMath::Sqrt(cov[2]+dZ*dZ/12.);
-    Double_t dphi =  scaleFact*3.*TMath::Sqrt(cov[0]+dY*dY/12.)/sensRadius; 
+    Double_t dz   =  scaleFact*3.*TMath::Sqrt(TMath::Abs(cov[2])+dZ*dZ/12.);
+    Double_t dphi =  scaleFact*3.*TMath::Sqrt(TMath::Abs(cov[0])+dY*dY/12.)/sensRadius; 
 
     Double_t phi=TMath::ATan2(par[0],x) + trackTOFin->GetAlpha();
     if (phi<-TMath::Pi())phi+=2*TMath::Pi();