From 00b459eb85eb6d72adb53cb2fff98bbc549f20d4 Mon Sep 17 00:00:00 2001 From: hristov Date: Tue, 25 Oct 2005 14:20:12 +0000 Subject: [PATCH] New header file with the DAQ configuration (C.Cheshkov). --- STEER/AliModule.cxx | 7 +++---- STEER/AliSimulation.cxx | 20 ++------------------ 2 files changed, 5 insertions(+), 22 deletions(-) diff --git a/STEER/AliModule.cxx b/STEER/AliModule.cxx index 15e06c96e2f..a7d8e78d179 100644 --- a/STEER/AliModule.cxx +++ b/STEER/AliModule.cxx @@ -51,7 +51,9 @@ #include "AliRun.h" #include "AliTrackReference.h" #include "AliMC.h" -#include "../RAW/AliRawDataHeader.h" +#include "AliRawDataHeader.h" + +#include "AliDAQConfig.h" ClassImp(AliModule) @@ -865,9 +867,6 @@ void AliModule::Digits2Raw() AliWarning(Form("Dummy version called for %s", GetName())); - const Int_t kNDetectors = 17; - const char* kDetectors[kNDetectors] = {"TPC", "ITSSPD", "ITSSDD", "ITSSSD", "TRD", "TOF", "PHOS", "RICH", "EMCAL", "MUON", "MUTR", "ZDC", "PMD", "START", "VZERO", "CRT", "FMD"}; - const Int_t kDetectorDDLs[kNDetectors] = {216, 20, 12, 16, 18, 72, 20, 20, 22, 20, 2, 1, 6, 1, 1, 1, 3}; Int_t nDDLs = 1; Int_t ddlOffset = 0; for (Int_t i = 0; i < kNDetectors; i++) { diff --git a/STEER/AliSimulation.cxx b/STEER/AliSimulation.cxx index 26ec3ce5553..676103e31be 100644 --- a/STEER/AliSimulation.cxx +++ b/STEER/AliSimulation.cxx @@ -119,6 +119,8 @@ #include "AliSimulation.h" #include "AliVertexGenFile.h" +#include "AliDAQConfig.h" + ClassImp(AliSimulation) @@ -655,24 +657,6 @@ Bool_t AliSimulation::ConvertRawFilesToDate(const char* dateFileName) { // convert raw data DDL files to a DATE file with the program "dateStream" - // DATE setup - const Int_t kNDetectors = 17; - const char* kDetectors[kNDetectors] = {"TPC", "ITSSPD", "ITSSDD", "ITSSSD", - "TRD", "TOF", "PHOS", "RICH", - "EMCAL", "MUON", "MUTR", "ZDC", - "PMD", "START", "VZERO", "CRT", - "FMD"}; - const Int_t kDetectorDDLs[kNDetectors] = {216, 20, 12, 16, - 18, 72, 20, 20, - 22, 20, 2, 1, - 6, 1, 1, 1, - 3}; - const Float_t kDetectorLDCs[kNDetectors] = {46, 2, 2, 1, - 4, 2, 1, 2, - 1, 2, 1, 1, - 1, 0.5, 0.5, 1, - 1}; - char* path = gSystem->Which(gSystem->Getenv("PATH"), "dateStream"); if (!path) { AliError("the program dateStream was not found"); -- 2.43.5