From d94d17e147a098e4ecb2d2efe635c2c763ff2a16 Mon Sep 17 00:00:00 2001 From: hristov Date: Wed, 6 Feb 2008 11:17:33 +0000 Subject: [PATCH 1/2] Bug fix (Bjorn) --- ITS/AliITSInitGeometry.cxx | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/ITS/AliITSInitGeometry.cxx b/ITS/AliITSInitGeometry.cxx index 9ad4ae7235c..abef3f53eaf 100644 --- a/ITS/AliITSInitGeometry.cxx +++ b/ITS/AliITSInitGeometry.cxx @@ -2436,7 +2436,7 @@ Bool_t AliITSInitGeometry::WriteVersionString(Char_t *str,Int_t length, i=0;n=0; do{ cvslikedate[i] = cvsDate[i]; - if(cvsDate[i++]=='-'){ + if(cvsDate[i]=='+' || cvsDate[i++]=='-'){ n++; // count number of - cvslikedate[i-1] = '/'; // replace -'s by /'s. } // end if @@ -2552,4 +2552,3 @@ Bool_t AliITSInitGeometry::ReadVersionString(const Char_t *str,Int_t length, } // end switch return ok; } - From eb813b74bf319a5dcb23411f21626a21a5bc5b01 Mon Sep 17 00:00:00 2001 From: hristov Date: Wed, 6 Feb 2008 11:20:53 +0000 Subject: [PATCH 2/2] Fixed compilation on powerPC (Arthur) --- MUON/AliMUONRawStreamTracker.cxx | 4 ++-- MUON/AliMUONRawStreamTrackerHP.cxx | 2 +- MUON/AliMUONRawStreamTrigger.cxx | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/MUON/AliMUONRawStreamTracker.cxx b/MUON/AliMUONRawStreamTracker.cxx index 13c4b7d8827..958bc1f8adf 100644 --- a/MUON/AliMUONRawStreamTracker.cxx +++ b/MUON/AliMUONRawStreamTracker.cxx @@ -227,7 +227,7 @@ AliMUONRawStreamTracker::GetNextDDL() fPayload->ResetDDL(); #ifndef R__BYTESWAP - swap(buffer, totalDataWord); // swap needed for mac power pc + Swap(buffer, totalDataWord / sizeof(UInt_t)); // swap needed for mac power pc #endif Bool_t ok = fPayload->Decode(buffer, totalDataWord/4); @@ -393,7 +393,7 @@ Bool_t AliMUONRawStreamTracker::NextDDL() } #ifndef R__BYTESWAP - swap(buffer, totalDataWord); // swap needed for mac power pc + Swap(buffer, totalDataWord / sizeof(UInt_t)); // swap needed for mac power pc #endif Bool_t ok = fPayload->Decode(buffer, totalDataWord/4); diff --git a/MUON/AliMUONRawStreamTrackerHP.cxx b/MUON/AliMUONRawStreamTrackerHP.cxx index 197732433a4..783a8293286 100644 --- a/MUON/AliMUONRawStreamTrackerHP.cxx +++ b/MUON/AliMUONRawStreamTrackerHP.cxx @@ -208,7 +208,7 @@ Bool_t AliMUONRawStreamTrackerHP::NextDDL() } #ifndef R__BYTESWAP - Swap(fBuffer, dataSize); // Swap needed for mac power pc. + Swap(reinterpret_castfBuffer, dataSize / sizeof(UInt_t)); // Swap needed for mac power pc. #endif bool result = false; diff --git a/MUON/AliMUONRawStreamTrigger.cxx b/MUON/AliMUONRawStreamTrigger.cxx index a28f9705d7c..18c88b06b49 100644 --- a/MUON/AliMUONRawStreamTrigger.cxx +++ b/MUON/AliMUONRawStreamTrigger.cxx @@ -223,7 +223,7 @@ Bool_t AliMUONRawStreamTrigger::GetNextDDL() } #ifndef R__BYTESWAP - swap(buffer, totalDataWord); // swap needed for mac power pc + Swap(buffer, totalDataWord / sizeof(UInt_t)); // swap needed for mac power pc #endif fPayload->ResetDDL(); @@ -354,8 +354,8 @@ Bool_t AliMUONRawStreamTrigger::NextDDL() // check not necessary yet, but for future developments if (!GetReader()->ReadNext((UChar_t*)buffer, totalDataWord)) return kFALSE; -#ifndef R__BYTESWAP - swap(buffer, totalDataWord); // swap needed for mac power pc +#ifndef R__BYTESWAP + Swap(buffer, totalDataWord / sizeof(UInt_t)); // swap needed for mac power pc #endif fPayload->Decode(buffer);