From 6280c0e2045df933ca54fada9ba35f4fe9b72840 Mon Sep 17 00:00:00 2001 From: nick Date: Tue, 13 Feb 2007 13:47:57 +0000 Subject: [PATCH] 13-feb-2007 NvE IceRawTWR.cxx updated to ensure padding zeros in gps time word. Also old "F2K" comments corrected into "TWR raw" in IceRawTWR.cxx and IceRawTWR.h. --- RALICE/icepack/iceconvert/IceRawTWR.cxx | 6 +++--- RALICE/icepack/iceconvert/IceRawTWR.h | 2 +- RALICE/icepack/iceconvert/history.txt | 3 +++ 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/RALICE/icepack/iceconvert/IceRawTWR.cxx b/RALICE/icepack/iceconvert/IceRawTWR.cxx index fa15e48df26..6268b53e761 100644 --- a/RALICE/icepack/iceconvert/IceRawTWR.cxx +++ b/RALICE/icepack/iceconvert/IceRawTWR.cxx @@ -169,7 +169,7 @@ void IceRawTWR::SetOutputFile(TString name) { // Create the output file for the ROOT data. if (fOutfile) delete fOutfile; - fOutfile=new TFile(name.Data(),"RECREATE","F2K data in IceEvent structure"); + fOutfile=new TFile(name.Data(),"RECREATE","TWR raw data in IceEvent structure"); } /////////////////////////////////////////////////////////////////////////// TFile* IceRawTWR::GetOutputFile() @@ -328,8 +328,8 @@ void IceRawTWR::Exec(Option_t* opt) // The GPS telegram info gps=fEvent.gps; - gpslow=gps.seconds; // The low 24 bits of the seconds count - gpshigh=gps.info.bits.seconds; // The high 8 bits of the seconds count + gpslow=gps.seconds & 0x00FFFFFF; // The low 24 bits of the seconds count + gpshigh=gps.info.bits.seconds; // The high 8 bits of the seconds count gpssecs=gpshigh<<24; gpssecs+=gpslow; diff --git a/RALICE/icepack/iceconvert/IceRawTWR.h b/RALICE/icepack/iceconvert/IceRawTWR.h index 8738447f4be..fd46d1877ee 100644 --- a/RALICE/icepack/iceconvert/IceRawTWR.h +++ b/RALICE/icepack/iceconvert/IceRawTWR.h @@ -29,7 +29,7 @@ class IceRawTWR : public AliJob void SetPrintFreq(Int_t f); // Set printfrequency to provide info every f events void SetSplitLevel(Int_t split); // Set split level for the produced ROOT data file void SetBufferSize(Int_t bsize); // Set buffersize for the produced ROO data file - void AddInputFile(TString name); // Add name of F2K input file to the list + void AddInputFile(TString name); // Add name of TWR raw input file to the list void SetOutputFile(TFile* ofile); // Set output file for the ROOT data structures void SetOutputFile(TString name); // Create output file for the ROOT data structures TFile* GetOutputFile(); // Provide pointer to the ROOT output file diff --git a/RALICE/icepack/iceconvert/history.txt b/RALICE/icepack/iceconvert/history.txt index 87b27782fd9..5acaa988b25 100644 --- a/RALICE/icepack/iceconvert/history.txt +++ b/RALICE/icepack/iceconvert/history.txt @@ -85,5 +85,8 @@ event structures. 11-jan-2007 NvE IceRawTWR.cxx updated to prevent gcc compiler warnings about unused variables. +13-feb-2007 NvE IceRawTWR.cxx updated to ensure padding zeros in gps time word. + Also old "F2K" comments corrected into "TWR raw" in IceRawTWR.cxx + and IceRawTWR.h. -- 2.39.3