AliSTARTRawData.cxx AliSTARTRawData.h Coding Convemtion Violetions fixed according...

diff --git a/START/AliSTARTDigitizer.cxx b/START/AliSTARTDigitizer.cxx
index 1da215c4c60450c9115b49b9c8394b23649d616f..cc986167425732da967a25a73b56051feb35bfa6 100644 (file)
--- a/START/AliSTARTDigitizer.cxx
+++ b/START/AliSTARTDigitizer.cxx
@@ -59,7 +59,6 @@ AliSTARTDigitizer::AliSTARTDigitizer(AliRunDigitizer* manager)
    fSumMult(0),
    fEff(0)
 {
    fSumMult(0),
    fEff(0)
 {

-  //   cout<<"AliSTARTDigitizer::AliSTARTDigitizer"<<endl;

 // ctor which should be used
 
   AliDebug(1,"processed");
 // ctor which should be used
 
   AliDebug(1,"processed");


@@ -126,7 +125,6 @@ void AliSTARTDigitizer::Exec(Option_t* /*option*/)
   AliLoader * pOutStartLoader = outRL->GetLoader("STARTLoader");
 
   AliDebug(1,"start...");
   AliLoader * pOutStartLoader = outRL->GetLoader("STARTLoader");
 
   AliDebug(1,"start...");

-  cout<<" AliSTARTDigitizer::Exec "<<endl;

   //input loader
   //
   // From hits to digits
   //input loader
   //
   // From hits to digits


@@ -252,7 +250,6 @@ void AliSTARTDigitizer::Exec(Option_t* /*option*/)
        if (al>threshold) {
          qt=Int_t (TMath::Log(al*ph2mV) * mV2channel); 
          qtAmp=Int_t (TMath::Log(al*10*ph2mV) * mV2channel);
        if (al>threshold) {
          qt=Int_t (TMath::Log(al*ph2mV) * mV2channel); 
          qtAmp=Int_t (TMath::Log(al*10*ph2mV) * mV2channel);

-         cout<<i<<" "<<qt<<" "<<qtAmp<<endl;

          fADC->AddAt(qt,i);
          ftimeTDC->AddAt(tr,i);
          fADCAmp->AddAt(qtAmp,i);
          fADC->AddAt(qt,i);
          ftimeTDC->AddAt(tr,i);
          fADCAmp->AddAt(qtAmp,i);


@@ -301,7 +298,6 @@ Bool_t AliSTARTDigitizer::RegisterPhotoE(Double_t energy)
   
   //  Float_t hc=197.326960*1.e6; //mev*nm
   Double_t hc=1.973*1.e-6; //gev*nm
   
   //  Float_t hc=197.326960*1.e6; //mev*nm
   Double_t hc=1.973*1.e-6; //gev*nm

-  //  cout<<"AliSTARTDigitizer::RegisterPhotoE >> energy "<<energy<<endl;

   Float_t lambda=hc/energy;
   Int_t bin=  fEff->GetXaxis()->FindBin(lambda);
   Float_t eff=fEff->GetBinContent(bin);
   Float_t lambda=hc/energy;
   Int_t bin=  fEff->GetXaxis()->FindBin(lambda);
   Float_t eff=fEff->GetBinContent(bin);

diff --git a/START/AliSTARTRawData.cxx b/START/AliSTARTRawData.cxx
index 73af4aa96e1c0077a318b7fdf8b5705e2f476b77..b9b2f9b7231c11529377b799f3b03c7f6945c158 100644 (file)
--- a/START/AliSTARTRawData.cxx
+++ b/START/AliSTARTRawData.cxx
@@ -26,11 +26,6 @@
 #include "AliSTART.h"
 #include "AliSTARTRawData.h"
 #include "AliSTARTdigit.h"
 #include "AliSTART.h"
 #include "AliSTARTRawData.h"
 #include "AliSTARTdigit.h"

-//#include "AliSTARTLoader.h"
-
-#include <AliLoader.h>
-#include <AliRunLoader.h>
-#include <TClonesArray.h>

 #include <TTree.h>
 #include "AliRawDataHeader.h"
 
 #include <TTree.h>
 #include "AliRawDataHeader.h"
 


@@ -39,14 +34,30 @@ ClassImp(AliSTARTRawData)
 //_____________________________________________________________________________
 AliSTARTRawData::AliSTARTRawData():TObject()
 {
 //_____________________________________________________________________________
 AliSTARTRawData::AliSTARTRawData():TObject()
 {

-
+  /*
+-  48 channels (2 words each as in TOF DDL) for :
+word 1 :0-5bit number of PMT; word 2: 0-7 error sign, 8-31 TDC
+and the same but for amplified signal. Now I wrote the same time because
+CDF are not ready and differences didn't measured yet.
+
+-  96 channel for amplitude: very preliminary, QTC features are not
+known now, preliminary i put as T1 time signal for this PMT in first
+channel and T1+A in second, where A=Log(Amplitude);
+and the same for amplified but A=Log(10*Amplitude).
+
+- T0-A and T0-C 2 channels
+- T0A-T0C vertex information
+- Time Meaner where T0C TOF increase to the T0A TOF distance
+- 6 multiplicity signals the same way as amplitude and with the same
+uncertances
+  */

 
   fIndex=-1;
   fDigits = NULL;
 
 
   fIndex=-1;
   fDigits = NULL;
 

-  ftimeTDC = new TArrayI(24);
+  fTimeTDC = new TArrayI(24);

   fADC = new TArrayI(24);
   fADC = new TArrayI(24);

-  ftimeTDCAmp = new TArrayI(24);
+  fTimeTDCAmp = new TArrayI(24);

   fADCAmp = new TArrayI(24);
   fSumMult = new TArrayI(6);
    //   this->Dump();
   fADCAmp = new TArrayI(24);
   fSumMult = new TArrayI(6);
    //   this->Dump();


@@ -74,9 +85,9 @@ AliSTARTRawData::~AliSTARTRawData()
     delete fDigits;
     fDigits = NULL;
   }
     delete fDigits;
     fDigits = NULL;
   }

-  delete ftimeTDC;
+  delete fTimeTDC;

   delete fADC;
   delete fADC;

-  delete ftimeTDCAmp;
+  delete fTimeTDCAmp;

   delete fADCAmp;
   delete fSumMult;
 }
   delete fADCAmp;
   delete fSumMult;
 }


@@ -107,18 +118,18 @@ void AliSTARTRawData::GetDigits(AliSTARTdigit *fDigits, UInt_t *buf)
   Int_t error=0;
     // Get the digits array
 
   Int_t error=0;
     // Get the digits array
 

-  fDigits->GetTime(*ftimeTDC);
+  fDigits->GetTime(*fTimeTDC);

   fDigits->GetADC(*fADC);
   fDigits->GetADC(*fADC);

-  fDigits->GetTimeAmp(*ftimeTDCAmp);
+  fDigits->GetTimeAmp(*fTimeTDCAmp);

   fDigits->GetADCAmp(*fADCAmp);
   fDigits->GetSumMult(*fSumMult);
      
   // Loop through all PMT
  
   for (Int_t det = 0; det < 24; det++) {
   fDigits->GetADCAmp(*fADCAmp);
   fDigits->GetSumMult(*fSumMult);
      
   // Loop through all PMT
  
   for (Int_t det = 0; det < 24; det++) {

-    Int_t time=ftimeTDC->At(det);
+    Int_t time=fTimeTDC->At(det);

     Int_t qtc=fADC->At(det);
     Int_t qtc=fADC->At(det);

-    Int_t timeAmp=ftimeTDCAmp->At(det);
+    Int_t timeAmp=fTimeTDCAmp->At(det);

     Int_t qtcAmp=fADCAmp->At(det);
 
     //conver ADC to time (preliminary algorithm)
     Int_t qtcAmp=fADCAmp->At(det);
 
     //conver ADC to time (preliminary algorithm)


@@ -364,9 +375,11 @@ void AliSTARTRawData::PackWord(UInt_t &BaseWord, UInt_t Word, Int_t StartBit, In
 }
 //---------------------------------------------------------------------------------------
 
 }
 //---------------------------------------------------------------------------------------
 

-Int_t AliSTARTRawData::RawDataSTART(AliSTARTdigit *fDigits){
-  
-  //This method creates the Raw data files for TOF detector
+Int_t AliSTARTRawData::RawDataSTART(AliSTARTdigit *fDigits)
+{
+   //This method creates the Raw data files for START detector
+
+

   const Int_t kSize=512; //2*AliTOFGeometry::NpadXSector() 
                           //max number of digits per DDL file times 2
   UInt_t buf[kSize];
   const Int_t kSize=512; //2*AliTOFGeometry::NpadXSector() 
                           //max number of digits per DDL file times 2
   UInt_t buf[kSize];


@@ -374,7 +387,6 @@ Int_t AliSTARTRawData::RawDataSTART(AliSTARTdigit *fDigits){
   UInt_t word;
 
   fIndex=-1;
   UInt_t word;
 
   fIndex=-1;

-  // TClonesArray*& digits = * (TClonesArray**) branch->GetAddress();

 
   char fileName[15];
   ofstream outfile;         // logical name of the output file 
 
   char fileName[15];
   ofstream outfile;         // logical name of the output file 

diff --git a/START/AliSTARTRawData.h b/START/AliSTARTRawData.h
index 913984bbbd1358b9900c571db02c75ac07dc058a..22699ee2cf2e2a2d35839ea4d05972f39532c468 100644 (file)
--- a/START/AliSTARTRawData.h
+++ b/START/AliSTARTRawData.h
@@ -14,8 +14,8 @@
 #include "TObject.h"
 class AliSTART;
 class AliSTARTdigit;
 #include "TObject.h"
 class AliSTART;
 class AliSTARTdigit;

-class TTRee;
-class TBranch;
+//class TTRee;
+//class TBranch;

 //class AliRawDataHeader;
 class AliSTARTRawData : public TObject {
 
 //class AliRawDataHeader;
 class AliSTARTRawData : public TObject {
 


@@ -40,11 +40,10 @@ class AliSTARTRawData : public TObject {
 
  //START digits arrays
 
 
  //START digits arrays
 

-  AliSTARTdigit *fDigits;  //! The START digits manager

 
 

-  TArrayI *timeTDC() {return ftimeTDC;}
+  TArrayI *TimeTDC() {return fTimeTDC;}

   TArrayI *ADC() {return fADC;}
   TArrayI *ADC() {return fADC;}

-  TArrayI *timeTDCAmp() {return ftimeTDCAmp;}
+  TArrayI *TimeTDCAmp() {return fTimeTDCAmp;}

   TArrayI *ADCAmp() {return fADCAmp;}
   TArrayI *SumMult() {return fSumMult;}
 
   TArrayI *ADCAmp() {return fADCAmp;}
   TArrayI *SumMult() {return fSumMult;}
 


@@ -57,13 +56,14 @@ class AliSTARTRawData : public TObject {
 
   Int_t fTimeDiff     ; //time difference 
   Int_t fMeanTime      ; // average time - ALICE start signal 
 
   Int_t fTimeDiff     ; //time difference 
   Int_t fMeanTime      ; // average time - ALICE start signal 

-  Int_t fBestTimeLeft;
-  Int_t fBestTimeRight;
-  TArrayI * ftimeTDC;
-  TArrayI *  fADC;
-  TArrayI * ftimeTDCAmp;
-  TArrayI *  fADCAmp;
-  TArrayI *  fSumMult;
+  Int_t fBestTimeLeft;   //first particle on the left
+  Int_t fBestTimeRight;  //first particle on the right
+  TArrayI * fTimeTDC;        //TDC on the each PMT
+  TArrayI *  fADC;           //QTC (ADC) on the each PMT
+  TArrayI * fTimeTDCAmp;    // TDC with amplified signal
+  TArrayI *  fADCAmp;        //QTC amplified
+  TArrayI *  fSumMult;       //multiplicity: left, right, left&right + all amplified
+  AliSTARTdigit *fDigits;  //! The START digits manager

 
   ClassDef(AliSTARTRawData,1)             //  START raw data class
 
 
   ClassDef(AliSTARTRawData,1)             //  START raw data class