fixes for compilation warnings (Ruben)
authormasera <masera@f7af4fe6-9843-0410-8265-dc069ae4e863>
Fri, 17 Dec 2010 18:17:00 +0000 (18:17 +0000)
committermasera <masera@f7af4fe6-9843-0410-8265-dc069ae4e863>
Fri, 17 Dec 2010 18:17:00 +0000 (18:17 +0000)
ITS/AliITSAlignMille2.cxx
ITS/AliITSAlignMille2Constraint.h

index 745eb48..acdd2f5 100644 (file)
@@ -2367,7 +2367,8 @@ Int_t AliITSAlignMille2::GetRequestedModID(UShort_t voluid) const
   if (k<0) return -1;
   AliITSAlignMille2Module* md = GetMilleModule(k);
   while (md && md->IsNotInConf()) md = md->GetParent();
-  return md ? md->GetUniqueID() : -1; 
+  if (md) return int(md->GetUniqueID());
+  else return -1; 
 }
 
 //________________________________________________________________________________________________________
index 752ffa2..3012cfb 100644 (file)
@@ -44,8 +44,8 @@ class AliITSAlignMille2Constraint : public TNamed
   void         SetPattern(UInt_t pat)                {fPattern = pat;}
   void         SetValue(Double_t val)                {fVal = val;}
   void         SetApplied(Int_t par)                 {fApplied |= par<0 ? 0x0ffff : (0x1<<par);}
-  void         Disable()                             {fApplied |= 0x1<<kDisabledBit;}
-  void         Enable()                              {fApplied &= ~(0x1<<kDisabledBit);}
+  void         Disable()                             {fApplied |= UInt_t(0x1)<<kDisabledBit;}
+  void         Enable()                              {fApplied &= ~(UInt_t(0x1)<<kDisabledBit);}
   Bool_t       IsDisabled()             const        {return (fApplied>>kDisabledBit)&0x1;}
   //
   virtual Bool_t IncludesModule(Int_t id)            const {return fModuleID==id;}