This commit was manufactured by cvs2svn to create tag 'v4-08-00'.

sevdokim · Nov 28, 2007 · 2f8a8ef · 2f8a8ef
1 parent 6eecefe
commit 2f8a8ef
Show file tree

Hide file tree

Showing 227 changed files with 2,283 additions and 4,658 deletions.
diff --git a/ACORDE/AliACORDERawData.cxx b/ACORDE/AliACORDERawData.cxx
@@ -34,7 +34,7 @@
 #include "AliACORDERawData.h"
 #include "AliDAQ.h"
 #include "AliFstream.h"
-#include "AliRawDataHeaderSim.h"
+#include "AliRawDataHeader.h"
 
 
 ClassImp(AliACORDERawData)
@@ -83,7 +83,7 @@ void AliACORDERawData::WriteACORDERawData(Bool_t *b)
   AliFstream* fFile = new AliFstream(fileName);
 
   // write header
-  AliRawDataHeaderSim header;
+  AliRawDataHeader header;
   UInt_t header_position = fFile->Tellp();
   fFile->WriteBuffer((char*)(&header), sizeof(header));
 

diff --git a/ANALYSIS/AliAnalysisManager.cxx b/ANALYSIS/AliAnalysisManager.cxx
@@ -160,31 +160,32 @@ void AliAnalysisManager::Init(TTree *tree)
   // Init() will be called many times when running with PROOF.
    if (!tree) return;
    if (fDebug > 1) {
-      printf("->AliAnalysisManager::InitTree(%s)\n", tree->GetName());
+      printf("->AliAnalysisManager::Init(%s)\n", tree->GetName());
    }
 
-   // Call InitTree of EventHandler
+   // Call InitIO of EventHandler
    if (fOutputEventHandler) {
       if (fMode == kProofAnalysis) {
-         fOutputEventHandler->Init(0x0, "proof");
+         fOutputEventHandler->InitIO("proof");
       } else {
-         fOutputEventHandler->Init(0x0, "local");
+         fOutputEventHandler->InitIO("local");
       }
    }
 
    if (fInputEventHandler) {
+      fInputEventHandler->SetInputTree(tree);
       if (fMode == kProofAnalysis) {
-         fInputEventHandler->Init(tree, "proof");
+         fInputEventHandler->InitIO("proof");
       } else {
-         fInputEventHandler->Init(tree, "local");
+         fInputEventHandler->InitIO("local");
       }
    }
 
    if (fMCtruthEventHandler) {
       if (fMode == kProofAnalysis) {
-         fMCtruthEventHandler->Init(0x0, "proof");
+         fMCtruthEventHandler->InitIO("proof");
       } else {
-         fMCtruthEventHandler->Init(0x0, "local");
+         fMCtruthEventHandler->InitIO("local");
       }
    }
 
@@ -212,32 +213,6 @@ void AliAnalysisManager::SlaveBegin(TTree *tree)
       cout << "->AliAnalysisManager::SlaveBegin()" << endl;
    }
 
-   // Call Init of EventHandler
-   if (fOutputEventHandler) {
-      if (fMode == kProofAnalysis) {
-         fOutputEventHandler->Init("proof");
-      } else {
-         fOutputEventHandler->Init("local");
-      }
-   }
-
-   if (fInputEventHandler) {
-      fInputEventHandler->SetInputTree(tree);
-      if (fMode == kProofAnalysis) {
-         fInputEventHandler->Init("proof");
-      } else {
-         fInputEventHandler->Init("local");
-      }
-   }
-
-   if (fMCtruthEventHandler) {
-      if (fMode == kProofAnalysis) {
-         fMCtruthEventHandler->Init("proof");
-      } else {
-         fMCtruthEventHandler->Init("local");
-      }
-   }
-
    TIter next(fTasks);
    AliAnalysisTask *task;
    // Call CreateOutputObjects for all tasks

diff --git a/EMCAL/AliEMCALFolder.cxx b/EMCAL/AliEMCALFolder.cxx
@@ -205,14 +205,14 @@ void AliEMCALFolder::FillPi0Candidate(const Double_t mgg, AliESDCaloCluster* cl1
   int    indMax = 0, id=0;
   id = Int_t(absId[0]);
   rFirst = tFirst->GetTable(id);
-  double emax   = 0;//cl->GetTrueDigitEnergy(indMax, rFirst->fCc);
+  double emax   = cl->GetTrueDigitEnergy(indMax, rFirst->fCc);
   if(kNdigits > 1) {
     for(int i=1; i<kNdigits; i++) {
       id = Int_t(absId[i]);
       rFirst = tFirst->GetTable(id);
-      if(emax < 0){//cl->GetTrueDigitEnergy(i, rFirst->fCc)) {
+      if(emax < cl->GetTrueDigitEnergy(i, rFirst->fCc)) {
         indMax = i;
-        emax   = 0;//cl->GetTrueDigitEnergy(i, rFirst->fCc);
+        emax   = cl->GetTrueDigitEnergy(i, rFirst->fCc);
       }
     }
   }
@@ -357,7 +357,7 @@ TList *l, Double_t deff, Double_t w0, Double_t phiSlope)
       // cluster energy and position
       absId   = Int_t(dgAbsId[i]);
       rOld    = tOld->GetTable(absId);
-      //ampDigi = cl->GetTrueDigitAmplitude(i, rOld->fCc); // True amplitude
+      ampDigi = cl->GetTrueDigitAmplitude(i, rOld->fCc); // True amplitude
 
       new(digits[i]) AliEMCALDigit(Int_t(kPrim),0, absId, ampDigi, 0.0, i, 0.0); 
       dg     =  (AliEMCALDigit*)digits[i];

diff --git a/EMCAL/AliEMCALSuperModule.cxx b/EMCAL/AliEMCALSuperModule.cxx
@@ -15,9 +15,6 @@
 
 /* 
 $Log$
-Revision 1.3  2007/11/14 15:34:05  gustavo
-Coding violations corrected
-
 Revision 1.2  2007/09/11 19:38:15  pavlinov
 added pi0 calibration, linearity, shower profile
  
@@ -78,7 +75,7 @@ AliEMCALSuperModule & AliEMCALSuperModule::operator =(const AliEMCALSuperModule
   fParent = sm.fParent; 
   fLh = sm.fLh;
   fSMNumber = sm.fSMNumber;
-  return *this;
+
 } 
 
 AliEMCALSuperModule::~AliEMCALSuperModule()

diff --git a/EMCAL/EMCALLinkDefbase.h b/EMCAL/EMCALLinkDefbase.h
@@ -25,6 +25,10 @@
 #pragma link C++ class AliEMCALCalibHistoProducer+;
 #pragma link C++ class AliEMCALPreprocessor+;
 #pragma link C++ class AliEMCALRawUtils+;
+// Calibration staff
+#pragma link C++ class AliEMCALFolder;
+#pragma link C++ class AliEMCALSuperModule;
+#pragma link C++ class AliEMCALCell;
 // Tables without TTable
 #pragma link C++ class AliEMCALPi0SelectionParam+;
 #pragma link C++ class AliEMCALPi0SelectionParRec+;

diff --git a/EMCAL/EMCALLinkDefrec.h b/EMCAL/EMCALLinkDefrec.h
@@ -12,9 +12,5 @@
 #pragma link C++ class AliEMCALRecPointsQaESDSelector+;
 //
 #pragma link C++ class AliEMCALRecParam+;
-// Calibration staff
-#pragma link C++ class AliEMCALFolder;
-#pragma link C++ class AliEMCALSuperModule;
-#pragma link C++ class AliEMCALCell;
 
 #endif
diff --git a/EMCAL/libEMCALbase.pkg b/EMCAL/libEMCALbase.pkg
@@ -20,6 +20,9 @@ AliEMCALCalibData.cxx \
 AliEMCALCalibHistoProducer.cxx \
 AliEMCALPreprocessor.cxx \
 AliEMCALRawUtils.cxx \
+AliEMCALFolder.cxx \
+AliEMCALSuperModule.cxx \
+AliEMCALCell.cxx \
 AliEMCALPi0SelectionParam.cxx \
 AliEMCALCalibCoefs.cxx \
 AliEMCALCellInfo.cxx\

diff --git a/EMCAL/libEMCALrec.pkg b/EMCAL/libEMCALrec.pkg
@@ -7,14 +7,9 @@ AliEMCALTracker.cxx \
 AliEMCALPID.cxx \
 AliEMCALRecParam.cxx \
 AliEMCALRecPointsQaESDSelector.cxx \
-AliEMCALFolder.cxx \
-AliEMCALSuperModule.cxx \
-AliEMCALCell.cxx \
 
 HDRS= $(SRCS:.cxx=.h) 
 
-CINTHDRS:= $(HDRS) AliEMCALGeometry.h AliEMCALPi0SelectionParam.h
-
 DHDR:=EMCALLinkDefrec.h
 # have to tune
 EINCLUDE:=PYTHIA6 RAW EVGEN THijing
diff --git a/EVE/alice-macros/NLT_trackcount_init.C b/EVE/alice-macros/NLT_trackcount_init.C
@@ -50,16 +50,11 @@ void NLT_trackcount_init()
 
 void on_new_event()
 {
-  try {
-    Reve::PointSet* itsc = its_clusters();
-    itsc->SetMarkerColor(5);
+  Reve::PointSet* itsc = its_clusters();
+  itsc->SetMarkerColor(5);
 
-    Reve::PointSet* tpcc = tpc_clusters();
-    tpcc->SetMarkerColor(4);
-  }
-  catch(Reve::Exc_t& exc) {
-    printf("Exception loading ITS/TPC clusters: %s\n", exc.Data());
-  }
+  Reve::PointSet* tpcc = tpc_clusters();
+  tpcc->SetMarkerColor(4);
 
   primary_vertex(1, 1);
 

diff --git a/FMD/AliFMDAltroIO.cxx b/FMD/AliFMDAltroIO.cxx
@@ -23,7 +23,7 @@
 // Mapping of ALTRO hardware channel to detector coordinates 
 //
 #include "AliFMDAltroIO.h"
-#include <AliRawDataHeaderSim.h>
+#include <AliRawDataHeader.h>
 #include <AliRawReader.h>
 #include "AliLog.h"
 #include <iostream>
@@ -310,7 +310,7 @@ AliFMDAltroWriter::AliFMDAltroWriter(std::ostream& stream)
   // Write a dummy header
   fHeader = fOutput.tellp();
   if (fOutput.bad()) throw -kBadTell;
-  AliRawDataHeaderSim header;
+  AliRawDataHeader header;
   fOutput.write((char*)(&header), sizeof(header));
   if (fOutput.bad()) throw -kBadWrite;
   fBegin = fOutput.tellp();
@@ -342,7 +342,7 @@ AliFMDAltroWriter::Close()
   if (fOutput.bad()) return -kBadTell;
   fOutput.seekp(fHeader, std::ios_base::beg);
   if (fOutput.bad()) return -kBadSeek;
-  AliRawDataHeaderSim header;
+  AliRawDataHeader header;
   header.fSize = (UShort_t(end) - fHeader);
   AliFMDDebug(15, ("Size set to %d (%d)", header.fSize, fTotal));
   header.SetAttribute(0);