suppressed std:... implicit calls

diff --git a/ITS/UPGRADE/AliITSUSDigit.cxx b/ITS/UPGRADE/AliITSUSDigit.cxx
index f2f2edf71cc02b170adee3eaff79a8a044302630..70ebb8de7f154ef57fe7f4199c39fbde83ad4bf5 100644 (file)
--- a/ITS/UPGRADE/AliITSUSDigit.cxx
+++ b/ITS/UPGRADE/AliITSUSDigit.cxx
@@ -12,7 +12,6 @@
  * about the suitability of this software for any purpose. It is          *
  * provided "as is" without express or implied warranty.                  *
  **************************************************************************/
-#include <Riostream.h>
 #include <TMath.h>
 #include "AliLog.h"
 #include "AliITSUSDigit.h"
@@ -138,9 +137,9 @@ void AliITSUSDigit::AddSignal(Int_t track,Int_t hit,Double_t signal)
       for (i=1;i<fNTracks;i++) {
        j = i;
        while(j>0 && fSignal[j]>fSignal[j-1]) {
-         swap(fTrack[j-1],fTrack[j]);
-         swap(fHits[j-1] ,fHits[j]);
-         swap(fSignal[j-1],fSignal[j]);
+         std::swap(fTrack[j-1],fTrack[j]);
+         std::swap(fHits[j-1] ,fHits[j]);
+         std::swap(fSignal[j-1],fSignal[j]);
          j--;
        } // end while
       } // end if i
@@ -213,51 +212,6 @@ void AliITSUSDigit::ShiftIndices(Int_t fileIndex)
   for (int i=GetNTracks();i--;) fTrack[i] += fileIndex;
 }
 
-//______________________________________________________________________
-void AliITSUSDigit::Print(ostream *os) const 
-{
-  //Standard output format for this class
-  Int_t i;
-  //
-  *os << fModule <<","<<GetUniqueID()<<","<<fNTracks<<",";
-  for (i=0;i<fNTracks;i++) *os << fTrack[i] <<",";
-  for (i=0;i<fNTracks;i++) *os << fHits[i] <<",";
-  for (i=0;i<fNTracks;i++) *os << fSignal[i] <<",";
-  *os << fTsignal <<","<< fNoise << "," << fSignalAfterElect;
-}
-
-//______________________________________________________________________
-void AliITSUSDigit::Read(istream *is) 
-{
-  // Standard output streaming function.
-  Int_t i,iss;
-  UInt_t ind;
-  //
-  *is >> fModule >> ind >> fNTracks;
-  SetUniqueID(ind);
-  *is >> iss; // read in fNTracks
-  for(i=0;i<fNTracks&&i<iss;i++) *is >> fTrack[i];
-  for(i=0;i<fNTracks&&i<iss;i++) *is >> fHits[i];
-  for(i=0;i<fNTracks&&i<iss;i++) *is >> fSignal[i];
-  *is >> fTsignal >> fNoise >> fSignalAfterElect;
-}
-
-//______________________________________________________________________
-ostream &operator<<(ostream &os,AliITSUSDigit &source)
-{
-  // Standard output streaming function.
-  source.Print(&os);
-  return os;
-}
-
-//______________________________________________________________________
-istream &operator>>(istream &os,AliITSUSDigit &source)
-{
-  // Standard output streaming function.
-  source.Read(&os);
-  return os;
-}
-
 //______________________________________________________________________
 Int_t AliITSUSDigit::Compare(const TObject* obj) const
 {

diff --git a/ITS/UPGRADE/AliITSUSDigit.h b/ITS/UPGRADE/AliITSUSDigit.h
index a27400395c6dfc5281658f500c4b3284bbf4bd2c..29b33adeb750af482767b79e849a472667f971da 100644 (file)
--- a/ITS/UPGRADE/AliITSUSDigit.h
+++ b/ITS/UPGRADE/AliITSUSDigit.h
@@ -35,8 +35,6 @@ class AliITSUSDigit: public TObject
   void Add(const AliITSUSDigit *pl);
   void AddTo(Int_t fileIndex, const AliITSUSDigit *pl);
   void ShiftIndices(Int_t fileIndex);
-  void Print(ostream *os) const;
-  void Read(istream *is);
   void Print(Option_t *option="")                 const;
   Int_t Read(const char *name)                          {return TObject::Read(name);}
   //
@@ -60,9 +58,6 @@ class AliITSUSDigit: public TObject
   ClassDef(AliITSUSDigit,1) // Item list of signals and track numbers
 };     
 
-// Input and output functions for standard C++ input/output.
-ostream & operator<<(ostream &os,AliITSUSDigit &source);
-istream & operator>>(istream &is,AliITSUSDigit &source);
 
 
 #endif

diff --git a/ITS/UPGRADE/AliITSUSimulationPix.cxx b/ITS/UPGRADE/AliITSUSimulationPix.cxx
index 0d2b99f8e15e779c05a00eab7e63ee457666510d..07caa9f85a4a1cea7f55b61aa6050ae432415cd2 100644 (file)
--- a/ITS/UPGRADE/AliITSUSimulationPix.cxx
+++ b/ITS/UPGRADE/AliITSUSimulationPix.cxx
@@ -19,7 +19,6 @@
 * provided "as is" without express or implied warranty.                  *
 **************************************************************************/
 
-#include <Riostream.h>
 #include <TGeoGlobalMagField.h>
 #include <TH1.h>
 #include <TString.h>
@@ -242,8 +241,6 @@ void AliITSUSimulationPix::Hits2SDigits(AliITSUModule *mod)
        if (!(fSeg->LocalToDet(x,z,ix,iz))) continue; // outside
        el  = dt * de / fSimuParam->GetGeVToCharge();
        //
-       if (GetDebug(1)) if (el<=0.0) cout<<"el="<<el<<" dt="<<dt<<" de="<<de<<endl; // end if GetDebug
-       //
        sig = fSimuParam->SigmaDiffusion1D(TMath::Abs(thick + y)); 
        sigx=sig;
        sigz=sig*fda;
@@ -343,7 +340,6 @@ void AliITSUSimulationPix::Hits2SDigitsFast(AliITSUModule *mod)
        sigz=sig*fda;
        if (fSimuParam->GetPixLorentzDrift()) ld=(y+thick)*fTanLorAng;
        SpreadChargeAsym(x,z,ix,iz,el,sigx,sigz,ld,idtrack,h);
-       //                cout << "sigx sigz " << sigx << " " << sigz << endl; // dom
       } // end for i // End Integrate over t
     else { // st == 0.0 deposit it at this point
       x   = x0;
@@ -443,13 +439,7 @@ void AliITSUSimulationPix::SpreadCharge(Double_t x0,Double_t z0,
        z2 -= z0; // Distance from where track traveled
        s   = el*0.25; // Correction based on definision of Erfc
        s  *= AliMathBase::ErfcFast(sp*x1) - AliMathBase::ErfcFast(sp*x2);
-       if (GetDebug(3)) {
-        cout <<"el="<<el<<" ix0="<<ix0<<" ix="<<ix<<" x0="<<x<<
-          " iz0="<<iz0<<" iz="<<iz<<" z0="<<z<< 
-          " sp*x1="<<sp*x1<<" sp*x2="<<sp*x2<<" s="<<s;
-       } // end if GetDebug
        s  *= AliMathBase::ErfcFast(sp*z1) - AliMathBase::ErfcFast(sp*z2);
-       if (GetDebug(3)) cout<<" sp*z1="<<sp*z1<<" sp*z2="<<sp*z2<<" s="<<s<< endl; // end if GetDebug
        if (s>fSimuParam->GetPixMinElToAdd()) UpdateMapSignal(iz,ix,t,hi,s);
      } // end for ix, iz
    //
@@ -493,18 +483,10 @@ void AliITSUSimulationPix::SpreadChargeAsym(Double_t x0,Double_t z0,
                                x0,z0,ix0,iz0,el,sigx,sigz,t,hi,ld));
   if (sigx<=0.0 || sigz<=0.0) { // if sig<=0 No diffusion to simulate.
     UpdateMapSignal(iz0,ix0,t,hi,el);
-    if (GetDebug(2)) {
-      cout << "sigx<=0.0=" << sigx << endl;
-      cout << "sigz<=0.0=" << sigz << endl;
-    } // end if GetDebug
     return;
   } // end if
   spx = 1.0/(sigx*kRoot2);     
   spz = 1.0/(sigz*kRoot2);
-  if (GetDebug(2)) {
-    cout << "sigx=" << sigx << " spx=" << spx << endl;
-    cout << "sigz=" << sigz << " spz=" << spz << endl;
-  } // end if GetDebug
   ixs = TMath::Max(-knx+ix0,0);
   ixe = TMath::Min(knx+ix0,fSeg->Npx()-1);
   izs = TMath::Max(-knz+iz0,0);
@@ -526,9 +508,7 @@ void AliITSUSimulationPix::SpreadChargeAsym(Double_t x0,Double_t z0,
       z2 -= z0; // Distance from where track traveled
       s   = el*0.25; // Correction based on definision of Erfc
       s  *= AliMathBase::ErfcFast(spx*x1) - AliMathBase::ErfcFast(spx*x2);
-      if (GetDebug(3)) cout <<"el="<<el<<" ix0="<<ix0<<" ix="<<ix<<" x0="<<x<<" iz0="<<iz0<<" iz="<<iz<<" z0="<<z<<" spx*x1="<<spx*x1<<" spx*x2="<<spx*x2<<" s="<<s; // end if GetDebug
       s  *= AliMathBase::ErfcFast(spz*z1) - AliMathBase::ErfcFast(spz*z2);
-      if (GetDebug(3)) cout<<" spz*z1="<<spz*z1<<" spz*z2="<<spz*z2<<" s="<<s<< endl; // end if GetDebug
       if (s>fSimuParam->GetPixMinElToAdd()) UpdateMapSignal(iz,ix,t,hi,s);
     } // end for ix, iz
   //