Corrections implemented into AliAnalysisHadEtReconstructed, simulated hadronic and...

[u/mrichter/AliRoot.git] / VZERO / AliVZEROTriggerSimulator.cxx

diff --git a/VZERO/AliVZEROTriggerSimulator.cxx b/VZERO/AliVZEROTriggerSimulator.cxx
index 518bad66a1f3ecd04f121e662d413d016174699b..b9dbc87ab2967206071cae980dcf7685503c5504 100644 (file)
--- a/VZERO/AliVZEROTriggerSimulator.cxx
+++ b/VZERO/AliVZEROTriggerSimulator.cxx
@@ -22,6 +22,7 @@
 \r
 #include <TTree.h>\r
 #include <TClonesArray.h>\r
+#include <TParameter.h>\r
 \r
 #include "AliLog.h"\r
 #include "AliCDBManager.h"\r
@@ -32,6 +33,8 @@
 #include "AliVZEROLogicalSignal.h"\r
 #include "AliVZEROTriggerSimulator.h"\r
 #include "AliVZEROdigit.h"\r
+#include "AliVZEROCalibData.h"\r
+#include "AliVZEROConst.h"\r
 \r
 ClassImp(AliVZEROTriggerSimulator)\r
 \r
@@ -44,7 +47,7 @@ TObject(),fTriggerData(NULL),fDigitsTree(digitsTree),fDigits(digits),fTriggerWor
        \r
        for(int i=0;i<64;i++) {\r
                fBBFlags[i] = fBGFlags[i] = kFALSE;\r
-               fCharges[i] = 0;\r
+               fCharges[i] = 0.;\r
        }\r
        GenerateBBWindows();\r
        GenerateBGWindows();\r
@@ -79,12 +82,14 @@ TObject(),fTriggerData(NULL),fDigitsTree(NULL),fDigits(NULL),fTriggerWord(0)
 //_____________________________________________________________________________\r
 AliVZEROTriggerSimulator::~AliVZEROTriggerSimulator(){\r
 // Destructor\r
-       if(fBBGate) delete [] fBBGate;\r
-       if(fBGGate) delete [] fBGGate;\r
-       if(fBBLatch) delete [] fBBLatch;\r
-       if(fBBReset) delete [] fBBReset;\r
-       if(fBGLatch) delete [] fBGLatch;\r
-       if(fBGReset) delete [] fBGReset;\r
+  for (Int_t i=0; i<AliVZEROTriggerData::kNCIUBoards; i++) {\r
+    delete fBBGate[i];\r
+    delete fBGGate[i];\r
+    delete fBBLatch[i];\r
+    delete fBBReset[i];\r
+    delete fBGLatch[i];\r
+    delete fBGReset[i];\r
+  }\r
 }\r
 \r
 //_____________________________________________________________________________\r
@@ -112,7 +117,7 @@ void AliVZEROTriggerSimulator::GenerateBGWindows()
 AliVZEROTriggerData * AliVZEROTriggerSimulator::LoadTriggerData() const \r
 {\r
        // Gets Trigger object for VZERO set\r
-       AliInfo("Loading Trigger parameters");\r
+        AliDebug(1,"Loading Trigger parameters");\r
        AliCDBManager *man = AliCDBManager::Instance();\r
        \r
        \r
@@ -153,26 +158,33 @@ void AliVZEROTriggerSimulator::Run() {
                        \r
                        Int_t integrator = digit->Integrator();\r
                        Int_t pmNumber   = digit->PMNumber();\r
-                       Int_t board   = pmNumber / 8;\r
-                       Int_t channel = pmNumber % 8;\r
+                       Int_t board   = AliVZEROCalibData::GetBoardNumber(pmNumber);\r
+                       Int_t channel = AliVZEROCalibData::GetFEEChannelNumber(pmNumber);\r
                        \r
                        if(fTriggerData->GetEnableCharge(board,channel)) {\r
-                               fCharges[pmNumber] = digit->ADC();\r
+                               fCharges[pmNumber] = digit->ChargeADC(AliVZEROdigit::kNClocks/2);\r
                                if(fTriggerData->GetPedestalSubtraction(board)) {\r
-                                       if(fCharges[pmNumber]>=fTriggerData->GetPedestalCut(integrator,board,channel)){ \r
-                                               fCharges[pmNumber] -= fTriggerData->GetPedestal(integrator,board,channel);\r
+                                       if(fCharges[pmNumber]>=(Float_t) fTriggerData->GetPedestalCut(integrator,board,channel)){ \r
+                                               fCharges[pmNumber] -= (Float_t) fTriggerData->GetPedestal(integrator,board,channel);\r
                                        } else {\r
-                                               fCharges[pmNumber] = 0;\r
+                                               fCharges[pmNumber] = 0.;\r
                                        }\r
                                }\r
                        } else {\r
-                               fCharges[pmNumber] = 0;\r
+                               fCharges[pmNumber] = 0.;\r
                        }\r
                        \r
-                       Float_t time = (Float_t)digit->Time() / 10.; // digit->Time() in bin of 100 picoseconds. Divide by 10 to have it in nanoseconds\r
-                       time += fTriggerData->GetDelayHit(board,channel);\r
-                       \r
-                       //AliInfo(Form(" PM nb : %d ; ADC= %d ; TDC= %f  Enable Time %d charge %d",pmNumber,digit->ADC(),time,fTriggerData->GetEnableTiming(board,channel),fTriggerData->GetEnableCharge(board,channel)));\r
+                       Float_t time = digit->Time();\r
+                       time -= kClockOffset;\r
+\r
+                       AliDebug(10,Form(" Digit: %f %d %d %d %d %d %d %d %d",digit->Time(),\r
+                                        digit->ChargeADC(8),digit->ChargeADC(9),digit->ChargeADC(10),\r
+                                        digit->ChargeADC(11),digit->ChargeADC(12),digit->ChargeADC(13),\r
+                                        digit->ChargeADC(14),digit->ChargeADC(15)));\r
+                       AliDebug(10,Form(" PM nb : %d ; TDC= %f(%f)  Enable Time %d charge %d inCoin %d charge %f",\r
+                                        pmNumber,time,digit->Time(),\r
+                                        fTriggerData->GetEnableTiming(board,channel),fTriggerData->GetEnableCharge(board,channel),\r
+                                        fBBGate[board]->IsInCoincidence(time),fCharges[pmNumber]));\r
                        fBBFlags[pmNumber] = fTriggerData->GetEnableTiming(board,channel) && fBBGate[board]->IsInCoincidence(time);\r
                        fBGFlags[pmNumber] = fTriggerData->GetEnableTiming(board,channel) && fBGGate[board]->IsInCoincidence(time);\r
                        \r
@@ -183,21 +195,35 @@ void AliVZEROTriggerSimulator::Run() {
        Int_t nBBflagsV0C = 0;\r
        Int_t nBGflagsV0A = 0;\r
        Int_t nBGflagsV0C = 0;\r
-       Int_t chargeV0A   = 0;\r
-       Int_t chargeV0C   = 0;\r
+       Float_t chargeV0A   = 0.;\r
+       Float_t chargeV0C   = 0.;\r
+       Int_t aBBflagsV0A = 0;\r
+       Int_t aBBflagsV0C = 0;\r
+       Int_t aBGflagsV0A = 0;\r
+       Int_t aBGflagsV0C = 0;\r
 \r
        for(int i=0;i<64;i++) {\r
                if(i<32) {\r
                        nBBflagsV0C += fBBFlags[i]; \r
                        nBGflagsV0C += fBGFlags[i];\r
                        chargeV0C += fCharges[i];\r
+                       if (fBBFlags[i]) aBBflagsV0C |= (1 << i);\r
+                       if (fBGFlags[i]) aBGflagsV0C |= (1 << i);\r
                } else {\r
                        nBBflagsV0A += fBBFlags[i]; \r
                        nBGflagsV0A += fBGFlags[i];\r
                        chargeV0A += fCharges[i];\r
+                       if (fBBFlags[i]) aBBflagsV0A |= (1 << (i-32));\r
+                       if (fBGFlags[i]) aBGflagsV0A |= (1 << (i-32));\r
                }\r
                //AliInfo(Form("Ch %d BB=%d BG=%d",i,fBBFlags[i],fBGFlags[i] )); \r
        }\r
+\r
+       // Store the BB and BG flags in the digits tree (user info)\r
+       fDigitsTree->GetUserInfo()->Add(new TParameter<int>("BBflagsV0A",aBBflagsV0A));\r
+       fDigitsTree->GetUserInfo()->Add(new TParameter<int>("BBflagsV0C",aBBflagsV0C));\r
+       fDigitsTree->GetUserInfo()->Add(new TParameter<int>("BGflagsV0A",aBGflagsV0A));\r
+       fDigitsTree->GetUserInfo()->Add(new TParameter<int>("BGflagsV0C",aBGflagsV0C));\r
        \r
        // BBA\r
        if(nBBflagsV0A>=fTriggerData->GetBBAThreshold())  SetBBA();\r