Corrected conversion float -> int

(Laurent)

diff --git a/MUON/AliMUONClusterFinderAZ.cxx b/MUON/AliMUONClusterFinderAZ.cxx
index 956d58c0191e3b7b8e00a0ae088e9e0eb9d7ea92..82fedb8bd1a0d2b6244927d2688cfe85ebaefc5e 100644 (file)
--- a/MUON/AliMUONClusterFinderAZ.cxx
+++ b/MUON/AliMUONClusterFinderAZ.cxx
@@ -257,7 +257,7 @@ void AliMUONClusterFinderAZ::AddPad(Int_t cath, Int_t digit)
 
   AliMUONDigit *mdig = fInput->Digit(cath,digit); 
 
-  Int_t charge = mdig->Signal();
+  Float_t charge = mdig->Signal();
   // get the center of the pad
   Float_t xpad, ypad, zpad0;
   //if (!fSegmentation[cath]->GetPadC(fInput->DetElemId(),mdig->PadX(),mdig->PadY(),xpad,ypad,zpad0)) {          // Handle "non-existing" pads
@@ -280,7 +280,9 @@ void AliMUONClusterFinderAZ::AddPad(Int_t cath, Int_t digit)
   fPadIJ[2][nPads] = mdig->PadX();
   fPadIJ[3][nPads] = mdig->PadY();
   fUsed[cath][digit] = kTRUE;
-  if (fDebug) printf(" bbb %d %d %f %f %f %f %f %4d %3d %3d \n", nPads, cath, xpad, ypad, zpad0, fXyq[3][nPads]*2, fXyq[4][nPads]*2, charge, mdig->PadX(), mdig->PadY());
+  if (fDebug) printf(" bbb %d %d %f %f %f %f %f %f %3d %3d \n", nPads, cath, 
+                     xpad, ypad, zpad0, fXyq[3][nPads]*2, fXyq[4][nPads]*2, 
+                     charge, mdig->PadX(), mdig->PadY());
   fnPads[cath]++;
 
   // Check neighbours
@@ -2293,7 +2295,7 @@ void AliMUONClusterFinderAZ::AddRawCluster(Double_t x, Double_t y, Double_t qTot
     if (fPadIJ[1][j] == -9) nover[cath]++;
     if (fPadIJ[1][j] != 1 && fPadIJ[1][j] != -9) continue;
     cnew.SetMultiplicity(cath,cnew.GetMultiplicity(cath)+1);
-    if (fXyq[2][j] > cnew.GetPeakSignal(cath)) cnew.SetPeakSignal(cath,TMath::Nint (fXyq[2][j]));
+    if (fXyq[2][j] > cnew.GetPeakSignal(cath)) cnew.SetPeakSignal(cath,fXyq[2][j]);
     //cnew.SetCharge(cath,cnew.GetCharge(cath) + TMath::Nint (fXyq[2][j]));
     cnew.SetContrib(npads[cath],cath,fXyq[2][j]);
     cnew.SetIndex(npads[cath],cath,TMath::Nint (fXyq[5][j]));

diff --git a/MUON/AliMUONClusterFinderVS.cxx b/MUON/AliMUONClusterFinderVS.cxx
index ba50e7dcf0856a4aabcbb98296ebb62fee9a7923..f0fcc7c56d62552a2f63fed1a850d10e7d0fa003 100644 (file)
--- a/MUON/AliMUONClusterFinderVS.cxx
+++ b/MUON/AliMUONClusterFinderVS.cxx
@@ -1189,8 +1189,8 @@ void  AliMUONClusterFinderVS::FillCluster(AliMUONRawCluster* c, Int_t flag, Int_
       dig= fInput->Digit(cath,c->GetIndex(i,cath));
       ix=dig->PadX()+c->GetOffset(i,cath);
       iy=dig->PadY();
-      Int_t q=dig->Signal();
-      if (!flag) q=Int_t(q*c->GetContrib(i,cath));
+      Float_t q=dig->Signal();
+      if (!flag) q *= c->GetContrib(i,cath);
       //       fprintf(stderr,"q %d c->fPeakSignal[ %d ] %d\n",q,cath,c->fPeakSignal[cath]);
       if (dig->Physics() >= dig->Signal()) {
        c->SetPhysics(i,2);
@@ -1277,7 +1277,7 @@ void  AliMUONClusterFinderVS::FillCluster(AliMUONRawCluster* c, Int_t cath)
       if (dr < dr0) {
        dr0 = dr;
        AliDebug(1,Form(" dr %f\n",dr));
-       Int_t q=dig->Signal();
+       Float_t q=dig->Signal();
        if (dig->Physics() >= dig->Signal()) {
          c->SetPhysics(i,2);
        } else if (dig->Physics() == 0) {
@@ -1306,7 +1306,7 @@ void  AliMUONClusterFinderVS::FindCluster(Int_t i, Int_t j, Int_t cath, AliMUONR
     
     Int_t idx = fDigitMap[cath]->GetHitIndex(i,j);
     AliMUONDigit* dig = (AliMUONDigit*) fDigitMap[cath]->GetHit(i,j);
-    Int_t q=dig->Signal();
+    Float_t q=dig->Signal();
     Int_t theX=dig->PadX();
     Int_t theY=dig->PadY(); 
    
@@ -1333,7 +1333,7 @@ void  AliMUONClusterFinderVS::FindCluster(Int_t i, Int_t j, Int_t cath, AliMUONR
     if (mu > 0) {
        for (Int_t ind = mu-1; ind >= 0; ind--) {
            Int_t ist=c.GetIndex(ind,cath);
-           Int_t ql=fInput->Digit(cath, ist)->Signal();
+           Float_t ql=fInput->Digit(cath, ist)->Signal();
            Int_t ix=fInput->Digit(cath, ist)->PadX();
            Int_t iy=fInput->Digit(cath, ist)->PadY();
            

diff --git a/MUON/AliMUONDigitCalibrator.cxx b/MUON/AliMUONDigitCalibrator.cxx
index 1b7b742f1f2f55506767ecb09588c6d57e412681..28bfda18da3c92f76fb656824e0fce66cd02ba60 100644 (file)
--- a/MUON/AliMUONDigitCalibrator.cxx
+++ b/MUON/AliMUONDigitCalibrator.cxx
@@ -118,17 +118,16 @@ AliMUONDigitCalibrator::Exec(Option_t*)
       }
       
       Int_t manuChannel = digit->ManuChannel();
-      Int_t adc = digit->Signal();
+      Float_t adc = digit->Signal();
       Float_t padc = adc-pedestal->ValueAsFloat(manuChannel,0);
       if ( padc < 3.0*pedestal->ValueAsFloat(manuChannel,1) ) 
       {
         padc = 0.0;
       }
       Float_t charge = padc*gain->ValueAsFloat(manuChannel,0);
-      Int_t signal = TMath::Nint(charge);
-      digit->SetSignal(signal);
+      digit->SetSignal(charge);
       Int_t saturation = gain->ValueAsInt(manuChannel,1);
-      if ( signal >= saturation )
+      if ( charge >= saturation )
       {
         digit->Saturated(kTRUE);
       }

diff --git a/MUON/AliMUONDisplay.cxx b/MUON/AliMUONDisplay.cxx
index a23898626f6a9cb52673f8115854155e791eca40..b68efd472d1978c450df4782aabc3c0f615f1dab 100644 (file)
--- a/MUON/AliMUONDisplay.cxx
+++ b/MUON/AliMUONDisplay.cxx
@@ -1092,7 +1092,7 @@ void AliMUONDisplay::LoadDigits(Int_t chamber, Int_t cathode)
            //
            // First get all needed parameters
            //
-           Int_t charge = mdig->Signal();
+           Float_t charge = mdig->Signal();
            Int_t index  = Int_t(TMath::Log(charge)/(TMath::Log(adcmax)/22));
            Int_t color  = 261+index;
            Int_t colorTrigger = 2;   
@@ -1100,11 +1100,11 @@ void AliMUONDisplay::LoadDigits(Int_t chamber, Int_t cathode)
            
            if (chamber > 10) { // trigger chamber 
                
-               Int_t sumCharge = 0;
+               Float_t sumCharge = 0;
                for (Int_t icharge = 0; icharge < 10; icharge++) {
                    sumCharge = sumCharge+mdig->TrackCharge(icharge);
                }
-               Int_t testCharge = sumCharge-(Int_t(sumCharge/10))*10;
+               Float_t testCharge = sumCharge-(Int_t(sumCharge/10))*10;
                if(sumCharge <= 10 || testCharge > 0) {
                    colorTrigger = color; 
                } else {
@@ -1168,7 +1168,7 @@ void AliMUONDisplay::LoadDigits(Int_t chamber, Int_t cathode)
            Int_t ix=mdig->PadX();
            Int_t iy=mdig->PadY();
            Int_t detElemId=mdig->DetElemId();      
-           Int_t charge = mdig->Signal();
+           Float_t charge = mdig->Signal();
            Int_t index  = Int_t(TMath::Log(charge)/(TMath::Log(adcmax)/22));
            Int_t color  = 261+index;
            Int_t colorTrigger = 2;   
@@ -1180,13 +1180,12 @@ void AliMUONDisplay::LoadDigits(Int_t chamber, Int_t cathode)
            AliMpPad pad = seg->PadByIndices(AliMpIntPair(ix,iy),kTRUE);
            
            if (chamber > 10) { // trigger chamber
-               Int_t sumCharge = 0;
+               Float_t sumCharge = 0;
     Int_t n = mdig->Ntracks();
                for (Int_t icharge = 0; icharge < n; icharge++) {
                    sumCharge = sumCharge+mdig->TrackCharge(icharge);
                }
-    assert(sumCharge==mdig->Signal());
-               Int_t testCharge = sumCharge-(Int_t(sumCharge/n))*n;
+               Float_t testCharge = sumCharge-(Int_t(sumCharge/n))*n;
                if(sumCharge <= n || testCharge > 0) {
                    colorTrigger = color; 
                } else {

diff --git a/MUON/AliMUONRawCluster.cxx b/MUON/AliMUONRawCluster.cxx
index 2b885a037e0427e02e35b54fc3211bb106c69cbf..5abe6f00f74cdfee4813a4f6d1c252a4cd627174 100644 (file)
--- a/MUON/AliMUONRawCluster.cxx
+++ b/MUON/AliMUONRawCluster.cxx
@@ -215,7 +215,7 @@ void AliMUONRawCluster::DumpIndex(void)
     }
 }
 //____________________________________________________
-Int_t AliMUONRawCluster::AddCharge(Int_t i, Int_t Q)
+Int_t AliMUONRawCluster::AddCharge(Int_t i, Float_t Q)
 {
 /// Adding Q to the fQ value
   if (i==0 || i==1) {
@@ -255,7 +255,7 @@ Int_t AliMUONRawCluster::AddZ(Int_t i, Float_t Z)
   else return 0;
 }
 //____________________________________________________
-Int_t AliMUONRawCluster::GetCharge(Int_t i) const
+Float_t AliMUONRawCluster::GetCharge(Int_t i) const
 {
 /// Getting the charge of the cluster
   if (i==0 || i==1) return fQ[i];
@@ -290,7 +290,7 @@ Int_t AliMUONRawCluster::GetTrack(Int_t i) const
   else  return 99999;
 }
 //____________________________________________________
-Int_t AliMUONRawCluster::GetPeakSignal(Int_t i) const 
+Float_t AliMUONRawCluster::GetPeakSignal(Int_t i) const 
 {
 /// Getting cluster peaksignal
   if (i==0 || i==1 ) return fPeakSignal[i];
@@ -330,7 +330,7 @@ Float_t AliMUONRawCluster::GetChi2(Int_t i) const
   else  return 99999.;
 }
 //____________________________________________________
-Int_t AliMUONRawCluster::SetCharge(Int_t i, Int_t Q)
+Int_t AliMUONRawCluster::SetCharge(Int_t i, Float_t Q)
 {
 /// Setting Charge of the cluster
   if (i==0 || i==1) {
@@ -380,7 +380,7 @@ Int_t AliMUONRawCluster::SetTrack(Int_t i, Int_t track)
   else return 0;
 }
 //____________________________________________________
-Int_t AliMUONRawCluster::SetPeakSignal(Int_t i, Int_t peaksignal)
+Int_t AliMUONRawCluster::SetPeakSignal(Int_t i, Float_t peaksignal)
 {
 /// Setting PeakSignal of the cluster
   if (i==0 || i==1 ) {