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.

diff --git a/RALICE/icepack/iceconvert/IceRawTWR.cxx b/RALICE/icepack/iceconvert/IceRawTWR.cxx
index fa15e48df267e0e87db6975d967f8eb84e1ad7c5..6268b53e76159f9109ece2bc70daaec77ca99470 100644 (file)
--- 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 8738447f4be4fb0da67d4796224f3c4669245aaa..fd46d1877ee220eaa0c90a8875a06e1eff2f5f0f 100644 (file)
--- 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 87b27782fd9b245480962723db10e2fed6d0e274..5acaa988b25cfde9e89d2c82bb7fe905322d29bd 100644 (file)
--- 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.