X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=ITS%2FAliITSOnlineSPDscan.h;h=385bf0ecd2434de0cd5019a2893c40f74f18b581;hb=835af245a886380caa6a182591876b744c38afdb;hp=088b715cb10cd5b9720e02853e4dcafbd2398cea;hpb=b15de2d227dc229b7a81172ca9c5e251a02fa520;p=u%2Fmrichter%2FAliRoot.git

diff --git a/ITS/AliITSOnlineSPDscan.h b/ITS/AliITSOnlineSPDscan.h
index 088b715cb10..385bf0ecd24 100644
--- a/ITS/AliITSOnlineSPDscan.h
+++ b/ITS/AliITSOnlineSPDscan.h
@@ -1,5 +1,5 @@
-#ifndef ALI_ITS_ONLINESPDSCAN_H
-#define ALI_ITS_ONLINESPDSCAN_H
+#ifndef ALIITSONLINESPDSCAN_H
+#define ALIITSONLINESPDSCAN_H
 
 ////////////////////////////////////////////////////////////
 // Author: Henrik Tydesjo                                 //
@@ -12,7 +12,7 @@
 // information is stored (AliITSOnlineSPDscanInfo).       //
 ////////////////////////////////////////////////////////////
 
-#include <Rtypes.h> 
+#include <TString.h>
 
 class TFile;
 class AliITSOnlineSPDscanInfo;
@@ -22,8 +22,8 @@ class AliITSOnlineSPDHitEvent;
 class AliITSOnlineSPDscan {
 
  public:
-  AliITSOnlineSPDscan():fFile(NULL),fWrite(kFALSE),fCurrentStep(-1),fModified(kFALSE),fInfoModified(kFALSE),fScanInfo(NULL){}
-  AliITSOnlineSPDscan(Char_t *fileName);
+  AliITSOnlineSPDscan():fFile(NULL),fWrite(kFALSE),fCurrentStep(-1),fModified(kFALSE),fInfoModified(kFALSE),fScanInfo(NULL),fFileName("./test.root"){for(Int_t ihs=0; ihs<6; ihs++){fCurrentHitArray[ihs]=0x0; fCurrentHitEvent[ihs]=0x0;}}
+  AliITSOnlineSPDscan(const Char_t *fileName, Bool_t readFromGridFile=kFALSE);
   AliITSOnlineSPDscan(const AliITSOnlineSPDscan& scan);
   virtual ~AliITSOnlineSPDscan();
   AliITSOnlineSPDscan& operator=(const AliITSOnlineSPDscan& scan);
@@ -34,6 +34,8 @@ class AliITSOnlineSPDscan {
   void     SetType(UInt_t val);
   void     SetRunNr(UInt_t val);
   void     SetRouterNr(UInt_t val);
+  void     SetHalfStaveScanned(UInt_t val, Bool_t b);
+  void     SetDataFormat(UInt_t val);
   void     SetTriggers(UInt_t nsi, UInt_t val);
   void     SetChipPresent(UInt_t hs, UInt_t chipi, Bool_t val);
   void     SetRowStart(UInt_t val);
@@ -41,6 +43,7 @@ class AliITSOnlineSPDscan {
   void     SetDacStart(UInt_t val);
   void     SetDacEnd(UInt_t val);
   void     SetDacStep(UInt_t val);
+  void     SetDCSVersion(UInt_t val);
 
   void     SetHits(UInt_t nsi, UInt_t hs, UInt_t chipi, UInt_t coli, UInt_t rowi, UInt_t val);
   void     IncrementTriggers(UInt_t nsi);
@@ -54,6 +57,8 @@ class AliITSOnlineSPDscan {
   UInt_t   GetType() const;
   UInt_t   GetRunNr() const;
   UInt_t   GetRouterNr() const;
+  Bool_t   GetHalfStaveScanned(UInt_t val) const;
+  UInt_t   GetDataFormat() const;
   UInt_t   GetTriggers(UInt_t nsi) const;
   Bool_t   GetChipPresent(UInt_t hs, UInt_t chipi) const;
   UInt_t   GetRowStart() const;
@@ -61,18 +66,19 @@ class AliITSOnlineSPDscan {
   UInt_t   GetDacStart() const;
   UInt_t   GetDacEnd() const;
   UInt_t   GetDacStep() const;
+  UInt_t   GetDCSVersion() const;
 
-  UInt_t   GetHits(UInt_t nsi, UInt_t hs, UInt_t chipi, UInt_t coli, UInt_t rowi);
-  Float_t  GetHitsEfficiency(UInt_t nsi, UInt_t hs, UInt_t chipi, UInt_t coli, UInt_t rowi);
+  UInt_t   GetHits(UInt_t nsi, UInt_t hs, UInt_t chipi, UInt_t coli, UInt_t rowi) ;
+  Float_t  GetHitsEfficiency(UInt_t nsi, UInt_t hs, UInt_t chipi, UInt_t coli, UInt_t rowi) ;
   Float_t  GetHitsEfficiencyError(UInt_t nsi, UInt_t hs, UInt_t chipi, UInt_t coli, UInt_t rowi);
-  UInt_t   GetHitEvents(UInt_t nsi, UInt_t hs, UInt_t chipi);
-  UInt_t   GetHitEventsTot(UInt_t nsi, UInt_t hs);
-  Float_t  GetHitEventsEfficiency(UInt_t nsi, UInt_t hs, UInt_t chipi);
-  Float_t  GetHitEventsTotEfficiency(UInt_t nsi, UInt_t hs);
-  Float_t  GetHitEventsEfficiencyError(UInt_t nsi, UInt_t hs, UInt_t chipi);
-  Float_t  GetHitEventsTotEfficiencyError(UInt_t nsi, UInt_t hs);
-  Float_t  GetAverageMultiplicity(UInt_t nsi, UInt_t hs, UInt_t chipi);
-  Float_t  GetAverageMultiplicityTot(UInt_t nsi, UInt_t hs);
+  UInt_t   GetHitEvents(UInt_t nsi, UInt_t hs, UInt_t chipi) ;
+  UInt_t   GetHitEventsTot(UInt_t nsi, UInt_t hs) ;
+  Float_t  GetHitEventsEfficiency(UInt_t nsi, UInt_t hs, UInt_t chipi) ;
+  Float_t  GetHitEventsTotEfficiency(UInt_t nsi, UInt_t hs) ;
+  Float_t  GetHitEventsEfficiencyError(UInt_t nsi, UInt_t hs, UInt_t chipi) ;
+  Float_t  GetHitEventsTotEfficiencyError(UInt_t nsi, UInt_t hs) ;
+  Float_t  GetAverageMultiplicity(UInt_t nsi, UInt_t hs, UInt_t chipi) ;
+  Float_t  GetAverageMultiplicityTot(UInt_t nsi, UInt_t hs) ;
 
  protected:
   TFile    *fFile;                  // file to read and write from
@@ -83,11 +89,11 @@ class AliITSOnlineSPDscan {
   AliITSOnlineSPDscanInfo *fScanInfo;           // overall scan information
   AliITSOnlineSPDHitArray *fCurrentHitArray[6]; // hit array, one for each halfstave
   AliITSOnlineSPDHitEvent *fCurrentHitEvent[6]; // hit events, one for each halfstave
-  Char_t   fFileName[200];                      // filename of file to read write
+  TString  fFileName;                           // filename of file to read write
 
   void     Init();
   void     CreateNewStep();
-  void     SwitchToStep(UInt_t nsi);
+  void     SwitchToStep(UInt_t nsi) ;
   void     FillGap(UInt_t nsi);
   void     ReadCurrentStep();
   void     SaveCurrentStep();