Removing warnings on Solaris x86

diff --git a/PHOS/AliPHOS.cxx b/PHOS/AliPHOS.cxx
index 29038cc2a26feaca2a61d92f369d9d97f54157c7..b951f0ef7bfe360e6dfe3f25041b7b6188de9a8c 100644 (file)
--- a/PHOS/AliPHOS.cxx
+++ b/PHOS/AliPHOS.cxx
@@ -16,6 +16,9 @@
 /* History of cvs commits:
  *
  * $Log$
+ * Revision 1.107  2007/01/29 16:29:37  kharlov
+ * Digits2Raw(): special workaround for digits with time out of range
+ *
  * Revision 1.106  2007/01/17 17:28:56  kharlov
  * Extract ALTRO sample generation to a separate class AliPHOSPulseGenerator
  *
@@ -536,7 +539,7 @@ void AliPHOS::Digits2Raw()
     // calculate the time response function
     } else {
       Double_t energy = 0 ;
-      Int_t   module = relId[0];
+      module = relId[0];
       if (digit->GetId() <= geom->GetNModules() * geom->GetNCristalsInModule()) {
        energy=digit->GetEnergy();
        if(energy>eMax) {eMax=energy; modMax=module; colMax=col; rowMax=row;}

diff --git a/PHOS/AliPHOSDigitizer.cxx b/PHOS/AliPHOSDigitizer.cxx
index 41942443bf534b7083c8259abef8b33522e78174..c0d06aa57fb1e6b2b5515562881440a3f4a6d647 100644 (file)
--- a/PHOS/AliPHOSDigitizer.cxx
+++ b/PHOS/AliPHOSDigitizer.cxx
@@ -18,6 +18,9 @@
 /* History of cvs commits:
  *
  * $Log$
+ * Revision 1.93  2006/10/17 13:17:01  kharlov
+ * Replace AliInfo by AliDebug
+ *
  * Revision 1.92  2006/08/28 10:01:56  kharlov
  * Effective C++ warnings fixed (Timur Pocheptsov)
  *
@@ -298,13 +301,13 @@ void AliPHOSDigitizer::Digitize(Int_t event)
   for(i = 1 ; i < fInput ; i++){
     TString tempo(fEventNames[i]) ; 
     tempo += i ;
-    AliPHOSGetter * gime = AliPHOSGetter::Instance(fInputFileNames[i], tempo) ;
+    AliPHOSGetter * gime1 = AliPHOSGetter::Instance(fInputFileNames[i], tempo) ;
     if (fManager) 
       ReadEvent = dynamic_cast<AliStream*>(fManager->GetInputStream(i))->GetCurrentEventNumber() ; 
     AliInfo(Form("Adding event %d from input stream %d %s %s", 
                 ReadEvent, i, fInputFileNames[i].Data(), tempo.Data())) ; 
-    gime->Event(ReadEvent,"S");
-    sdigArray->AddAt(gime->SDigits(), i) ;
+    gime1->Event(ReadEvent,"S");
+    sdigArray->AddAt(gime1->SDigits(), i) ;
   }
 
   //Find the first crystal with signal

diff --git a/PHOS/AliPHOSGetter.cxx b/PHOS/AliPHOSGetter.cxx
index afbdea213aa6c6434a506809f27b0dd3ba3aa4e1..a6c31a61aa83b5c5e9c5a7043e63a96e2fd8104f 100644 (file)
--- a/PHOS/AliPHOSGetter.cxx
+++ b/PHOS/AliPHOSGetter.cxx
@@ -465,7 +465,7 @@ AliPHOSGetter * AliPHOSGetter::Instance(const char* alirunFileName, const char*
       }
     }
     else {
-      AliRunLoader * rl = AliRunLoader::GetRunLoader(fgPhosLoader->GetTitle()) ; 
+      rl = AliRunLoader::GetRunLoader(fgPhosLoader->GetTitle()) ; 
       if ( strstr(version, AliConfig::GetDefaultEventFolderName()) ) // false in case of merging
        delete rl ; 
       fgObjGetter = new AliPHOSGetter(alirunFileName, version, openingOption) ;      

diff --git a/PHOS/AliPHOSRaw2Digits.cxx b/PHOS/AliPHOSRaw2Digits.cxx
index a48841cf6632e61ce1e7f0f9d3af982b8f324aab..18d0995581685803f444088963fbe99137d7b5b7 100644 (file)
--- a/PHOS/AliPHOSRaw2Digits.cxx
+++ b/PHOS/AliPHOSRaw2Digits.cxx
@@ -18,6 +18,9 @@
 /* History of cvs commits:
  *
  * $Log$
+ * Revision 1.14  2007/01/23 10:27:37  alibrary
+ * Adding include files where needed for latest ROOT
+ *
  * Revision 1.13  2006/09/07 18:31:08  kharlov
  * Effective c++ corrections (T.Pocheptsov)
  *
@@ -551,7 +554,7 @@ Bool_t AliPHOSRaw2Digits::ProcessRawFile(){
       Info("ProcessRawFile", "event= %d written", fEvent) ;
  
     // Read next record 
-    UInt_t nb = nwphr *sizeof(UInt_t);
+    nb = nwphr *sizeof(UInt_t);
     n = fread( recBuf, nb,1,dataFile);
     if (n < 0 ){
       perror(fInName);

diff --git a/PHOS/AliPHOSv1.cxx b/PHOS/AliPHOSv1.cxx
index ee5047f31b292fb3ce5baf6fdead4588624abf0f..0c268721b703b29845aa8a505864ba99ac55fe41 100644 (file)
--- a/PHOS/AliPHOSv1.cxx
+++ b/PHOS/AliPHOSv1.cxx
@@ -18,6 +18,9 @@
 /* History of cvs commits:
  *
  * $Log$
+ * Revision 1.106  2006/11/14 17:11:15  hristov
+ * Removing inheritances from TAttLine, TAttMarker and AliRndm in AliModule. The copy constructor and assignment operators are moved to the private part of the class and not implemented. The corresponding changes are propagated to the detectors
+ *
  * Revision 1.105  2006/09/13 07:31:01  kharlov
  * Effective C++ corrections (T.Pocheptsov)
  *
@@ -257,8 +260,8 @@ void AliPHOSv1::StepManager(void)
        Float_t x2 = cpvDigit2->GetXpad() ;
        Float_t z2 = cpvDigit2->GetYpad() ;
        if (x1==x2 && z1==z2) {
-         Float_t qsum = cpvDigit1->GetQpad() + cpvDigit2->GetQpad() ;
-         cpvDigit2->SetQpad(qsum) ;
+         Float_t qsumpad = cpvDigit1->GetQpad() + cpvDigit2->GetQpad() ;
+         cpvDigit2->SetQpad(qsumpad) ;
          cpvDigits->RemoveAt(idigit) ;
        }
       }

diff --git a/TRD/AliTRDsim.cxx b/TRD/AliTRDsim.cxx
index a881a89ffc98d813f09c0a96944fc981683b2ed4..ce243350257ec48d99aa4b6a3098264880dd2659 100644 (file)
--- a/TRD/AliTRDsim.cxx
+++ b/TRD/AliTRDsim.cxx
@@ -428,7 +428,7 @@ Int_t AliTRDsim::TrPhotons(Float_t p, Float_t mass
   Double_t csi2;
   Double_t rho1;
   Double_t rho2;
-  Double_t fSigma;
+  Double_t sigma;
   Double_t sum;
   Double_t nEqu;
   Double_t thetaN;
@@ -440,7 +440,7 @@ Int_t AliTRDsim::TrPhotons(Float_t p, Float_t mass
     energykeV = fSpectrum->GetBinCenter(iBin);
     energyeV  = energykeV * 1.0e3;
 
-    fSigma    = Sigma(energykeV);
+    sigma    = Sigma(energykeV);
 
     csi1      = fFoilOmega / energyeV;
     csi2      = fGapOmega  / energyeV;
@@ -462,7 +462,7 @@ Int_t AliTRDsim::TrPhotons(Float_t p, Float_t mass
     }
 
     // Equivalent number of foils
-    nEqu = (1.0 - TMath::Exp(-foils * fSigma)) / (1.0 - TMath::Exp(-fSigma));
+    nEqu = (1.0 - TMath::Exp(-foils * sigma)) / (1.0 - TMath::Exp(-sigma));
 
     // dN / domega
     fSpectrum->SetBinContent(iBin,4.0 * kAlpha * nEqu * sum /  (energykeV * (1.0 + tau)));

diff --git a/TRD/AliTRDv1.h b/TRD/AliTRDv1.h
index 99891f6b1ba6f4bd311083567061eaed9377d7b5..33119763fbd7d67b3d33889cd50da79748f800ee 100644 (file)
--- a/TRD/AliTRDv1.h
+++ b/TRD/AliTRDv1.h
@@ -47,7 +47,7 @@ class AliTRDv1 : public AliTRD {
           void     SelectStepManager(Int_t t);
 
           void     SetStepSize(Double_t s)    { fStepSize = s; }
-          void     SetTR(Bool_t kTRUE)        { fTRon = kTRUE; }
+          void     SetTR(Bool_t)              { fTRon = kTRUE; }
 
           Bool_t   GetTR() const              { return fTRon;  }
   AliTRDsim       *GetTRDsim() const          { return fTR;    }