From 6169f936bbf9b2270d92661a7936ca90c4d1ae7e Mon Sep 17 00:00:00 2001 From: hristov Date: Thu, 27 Apr 2006 13:26:38 +0000 Subject: [PATCH] Fixes for compilation warnings (Christian) --- FMD/AliFMD1.cxx | 5 +- FMD/AliFMD2.cxx | 1 + FMD/AliFMD3.cxx | 2 + FMD/AliFMDAltroMapping.cxx | 8 ++- FMD/AliFMDBaseDigit.cxx | 13 ++++ FMD/AliFMDBaseDigitizer.cxx | 5 +- FMD/AliFMDCalibFaker.cxx | 5 +- FMD/AliFMDCalibSampleRate.cxx | 2 +- FMD/AliFMDCalibStripRange.cxx | 2 +- FMD/AliFMDDetector.cxx | 4 ++ FMD/AliFMDDigitizer.cxx | 8 +-- FMD/AliFMDGeometry.h | 1 + FMD/AliFMDGeometryBuilder.cxx | 4 +- FMD/AliFMDParameters.cxx | 131 +++++++++++++++++++++++++++++++++- FMD/AliFMDParameters.h | 14 ++++ FMD/AliFMDPoints.h | 7 ++ FMD/AliFMDRawReader.cxx | 2 +- FMD/AliFMDRawStream.h | 8 +++ FMD/AliFMDReconstructor.cxx | 8 +-- FMD/AliFMDRing.cxx | 3 +- FMD/AliFMDSDigitizer.cxx | 14 ++-- FMD/AliFMDv1.cxx | 1 - FMD/Config.C | 13 ++-- STEER/AliESDFMD.cxx | 1 + STEER/AliESDFMD.h | 4 +- STEER/AliFMDFloatMap.cxx | 6 ++ STEER/AliFMDFloatMap.h | 5 ++ 27 files changed, 235 insertions(+), 42 deletions(-) diff --git a/FMD/AliFMD1.cxx b/FMD/AliFMD1.cxx index 91f3e77eae6..bc8956352d0 100644 --- a/FMD/AliFMD1.cxx +++ b/FMD/AliFMD1.cxx @@ -22,10 +22,11 @@ // // Concrete implementation of AliFMDDetector // -// This implements the geometry for FMD1 +// This implements the geometry for FMD1. // FMD1 has only one ring, of type `inner'. // It is sitting at z=320. -// It is the FMD ring with highest eta +// It is the FMD ring with highest eta. +// FMD1 currently has no support defined. // #include "AliFMD1.h" // ALIFMD1_H // #include "AliFMDRing.h" // ALIFMDRING_H diff --git a/FMD/AliFMD2.cxx b/FMD/AliFMD2.cxx index 350c035988d..37b9ebb5d3c 100644 --- a/FMD/AliFMD2.cxx +++ b/FMD/AliFMD2.cxx @@ -26,6 +26,7 @@ // The FMD2 has two ring, one of both types. // FMD2 is mounted on the space-frame via 4 flanges // Support is not fleshed ot yet. +// Support will be simple compared to FMD3. // #include "AliFMD2.h" // ALIFMD2_H // #include "AliFMDRing.h" // ALIFMDRING_H diff --git a/FMD/AliFMD3.cxx b/FMD/AliFMD3.cxx index ecdab228bb1..83eb9b9bce5 100644 --- a/FMD/AliFMD3.cxx +++ b/FMD/AliFMD3.cxx @@ -26,6 +26,8 @@ // This has 2 rings. // The support of the FMD3 is a carbon-fibre cone, attached to the ITS // support via flanges. The cone also supports the beam-pipe. +// The support is a special cone of carbon-fibre made by a Danish +// Yacht company. // #include "AliFMD3.h" // ALIFMD3_H #include "AliLog.h" // ALILOG_H diff --git a/FMD/AliFMDAltroMapping.cxx b/FMD/AliFMDAltroMapping.cxx index e731f4645e0..72683cb4675 100644 --- a/FMD/AliFMDAltroMapping.cxx +++ b/FMD/AliFMDAltroMapping.cxx @@ -22,15 +22,17 @@ // // Mapping of ALTRO hardware channel to detector coordinates // -// The hardware address consist of a DDL number and 12bits of ALTRO -// addresses. The ALTRO address are formatted as follows. +// The hardware address consist of a DDL number and 12bits of ALTRO +// addresses. The ALTRO address are formatted as follows. // // 12 7 4 0 // |---------------|---------|------------| // | Board # | ALTRO # | Channel # | // +---------------+---------+------------+ // -// +// The mapping is done purely by calculations. In the future, +// however, we may need some hard-coded stuff, or an external file to +// read from. // #include "AliFMDAltroMapping.h" // ALIFMDALTROMAPPING_H #include "AliFMDParameters.h" diff --git a/FMD/AliFMDBaseDigit.cxx b/FMD/AliFMDBaseDigit.cxx index f570effc8d0..5035dd7f128 100644 --- a/FMD/AliFMDBaseDigit.cxx +++ b/FMD/AliFMDBaseDigit.cxx @@ -128,6 +128,7 @@ AliFMDBaseDigit::GetName() const ULong_t AliFMDBaseDigit::Hash() const { + // Calculate a hash value based on the detector coordinates. size_t ringi = (fRing == 'I' || fRing == 'i' ? 0 : 1); return fStrip + fMaxStrips * (fSector + fMaxSectors * (ringi + fMaxRings * (fDetector - 1))); @@ -138,6 +139,18 @@ AliFMDBaseDigit::Hash() const Int_t AliFMDBaseDigit::Compare(const TObject* o) const { + // Compare to other digit. If the passed pointer to TObject does + // not point to an object of class AliFMDBaseDigit (or one of it's + // derived classes), then a fatal exception is made. + // + // Returns -1, if this object's detector coordinates are smaller + // than passed object's detector coordinates. + // + // Returns 0, if this object's detector coordinates is the same as + // passed object's detector coordinates. + // + // Returns 1, if this object's detector coordinates are larger + // than passed object's detector coordinates. if (!o) AliFatal("Can not compare to NULL!"); if (o->IsA() != AliFMDBaseDigit::Class()) diff --git a/FMD/AliFMDBaseDigitizer.cxx b/FMD/AliFMDBaseDigitizer.cxx index 62ea4c0a873..09125edd4d9 100644 --- a/FMD/AliFMDBaseDigitizer.cxx +++ b/FMD/AliFMDBaseDigitizer.cxx @@ -205,9 +205,9 @@ #include "AliFMDDetector.h" // ALIFMDDETECTOR_H #include "AliFMDRing.h" // ALIFMDRING_H #include "AliFMDHit.h" // ALIFMDHIT_H -#include "AliFMDDigit.h" // ALIFMDDIGIT_H +// #include "AliFMDDigit.h" // ALIFMDDIGIT_H #include "AliFMDParameters.h" // ALIFMDPARAMETERS_H -#include // ALIRUNDIGITIZER_H +// #include // ALIRUNDIGITIZER_H //#include // ALIRUN_H #include // ALILOADER_H #include // ALIRUNLOADER_H @@ -475,7 +475,6 @@ AliFMDBaseDigitizer::ConvertToCount(Float_t edep, UShort_t ped = MakePedestal(detector,ring,sector,strip); UInt_t maxAdc = param->GetAltroChannelSize(); UShort_t rate = param->GetSampleRate(detector,ring,sector,strip); - UShort_t size = param->GetAltroChannelSize(); // In case we don't oversample, just return the end value. if (rate == 1) { diff --git a/FMD/AliFMDCalibFaker.cxx b/FMD/AliFMDCalibFaker.cxx index baf9369793d..3693be68b62 100644 --- a/FMD/AliFMDCalibFaker.cxx +++ b/FMD/AliFMDCalibFaker.cxx @@ -27,8 +27,9 @@ // the bit mask passed to the constructor, or added by `AddCalib'. // // The default is to write all calibration parameters to a local -// storage `local://cdb' which is a directory in the current -// directory. +// storage `local://$ALICE_ROOT' which is were the sources live (sigh! +// - why oh why do we need to shit where we eat - it's just not +// healty). // #include "AliLog.h" // ALILOG_H #include "AliFMDCalibFaker.h" // ALIFMDCALIBFAKER_H diff --git a/FMD/AliFMDCalibSampleRate.cxx b/FMD/AliFMDCalibSampleRate.cxx index 5ac341033e1..80dbdba8cc1 100644 --- a/FMD/AliFMDCalibSampleRate.cxx +++ b/FMD/AliFMDCalibSampleRate.cxx @@ -27,7 +27,7 @@ // retrived from DCS or the like. // #include "AliFMDCalibSampleRate.h" // ALIFMDCALIBGAIN_H -#include "AliFMDParameters.h" // ALIFMDPARAMETERS_H +// #include "AliFMDParameters.h" // ALIFMDPARAMETERS_H #include //____________________________________________________________________ diff --git a/FMD/AliFMDCalibStripRange.cxx b/FMD/AliFMDCalibStripRange.cxx index 4da7294d296..9831c3ee832 100644 --- a/FMD/AliFMDCalibStripRange.cxx +++ b/FMD/AliFMDCalibStripRange.cxx @@ -27,7 +27,7 @@ // This information comes from DCS or the like. // #include "AliFMDCalibStripRange.h" // ALIFMDCALIBGAIN_H -#include "AliFMDParameters.h" // ALIFMDPARAMETERS_H +// #include "AliFMDParameters.h" // ALIFMDPARAMETERS_H //____________________________________________________________________ ClassImp(AliFMDCalibStripRange) diff --git a/FMD/AliFMDDetector.cxx b/FMD/AliFMDDetector.cxx index d23cf2d1fba..82b7ef5855e 100644 --- a/FMD/AliFMDDetector.cxx +++ b/FMD/AliFMDDetector.cxx @@ -22,6 +22,10 @@ //____________________________________________________________________ // +// AliFMDDetector. +// +// Base class for concrete FMD detectors, like AliFMD1, AliFMD2, +// AliFMD3. // Utility class to help implement the FMD geometry. This provides // the interface for the concrete geometry implementations of the FMD // sub-detectors. diff --git a/FMD/AliFMDDigitizer.cxx b/FMD/AliFMDDigitizer.cxx index f68ee457c99..ab26a1eb607 100644 --- a/FMD/AliFMDDigitizer.cxx +++ b/FMD/AliFMDDigitizer.cxx @@ -201,10 +201,10 @@ #include // ALILOG_H #include "AliFMDDigitizer.h" // ALIFMDDIGITIZER_H #include "AliFMD.h" // ALIFMD_H -#include "AliFMDGeometry.h" // ALIFMDGEOMETRY_H -#include "AliFMDDetector.h" // ALIFMDDETECTOR_H -#include "AliFMDRing.h" // ALIFMDRING_H -#include "AliFMDHit.h" // ALIFMDHIT_H +// #include "AliFMDGeometry.h" // ALIFMDGEOMETRY_H +// #include "AliFMDDetector.h" // ALIFMDDETECTOR_H +// #include "AliFMDRing.h" // ALIFMDRING_H +// #include "AliFMDHit.h" // ALIFMDHIT_H #include "AliFMDDigit.h" // ALIFMDDIGIT_H #include "AliFMDParameters.h" // ALIFMDPARAMETERS_H #include // ALIRUNDIGITIZER_H diff --git a/FMD/AliFMDGeometry.h b/FMD/AliFMDGeometry.h index abb51cc6c8f..38fa18c9640 100644 --- a/FMD/AliFMDGeometry.h +++ b/FMD/AliFMDGeometry.h @@ -18,6 +18,7 @@ // // This class is a singleton that handles the geometry parameters of // the FMD detectors. +// The actual code is done by various separate classes. // #ifndef ALIGEOMETRY_H # include diff --git a/FMD/AliFMDGeometryBuilder.cxx b/FMD/AliFMDGeometryBuilder.cxx index 6fc9a6a5de7..ed1e37aa459 100644 --- a/FMD/AliFMDGeometryBuilder.cxx +++ b/FMD/AliFMDGeometryBuilder.cxx @@ -21,10 +21,10 @@ //____________________________________________________________________ // // Builder of FMD geometry. +// // This class takes care of actually building the geometry using the // TGeo classes. Various parameters are fecthed from the // AliFMDGeometry manager. -// // Forward Multiplicity Detector based on Silicon wafers. This class // contains the base procedures for the Forward Multiplicity detector // Detector consists of 3 sub-detectors FMD1, FMD2, and FMD3, each of @@ -38,7 +38,7 @@ #include "AliFMD1.h" // ALIFMD1_H #include "AliFMD2.h" // ALIFMD2_H #include "AliFMD3.h" // ALIFMD3_H -#include "AliFMD.h" // ALIFMD_H +// #include "AliFMD.h" // ALIFMD_H #include "AliLog.h" // ALILOG_H #include // ROOT_TGeoVolume #include // ROOT_TGeoTube diff --git a/FMD/AliFMDParameters.cxx b/FMD/AliFMDParameters.cxx index 5cf64f50dde..546f20c181e 100644 --- a/FMD/AliFMDParameters.cxx +++ b/FMD/AliFMDParameters.cxx @@ -24,8 +24,10 @@ // // This class is a singleton that handles various parameters of // the FMD detectors. -// Eventually, this class will use the Conditions DB to get the -// various parameters, which code can then request from here. +// The manager normally serves the parameters from the Conditions +// Database (CDB). These are retrivied by the member function +// `Init'. Optionally, the class can serve hard-coded constants, if +// no CDB is available. // #include "AliLog.h" // ALILOG_H #include "AliFMDParameters.h" // ALIFMDPARAMETERS_H @@ -40,6 +42,8 @@ #include // ALICDBMANAGER_H #include #include +#include +#include //==================================================================== ClassImp(AliFMDParameters) @@ -113,6 +117,129 @@ AliFMDParameters::Init() } +//__________________________________________________________________ +#define DET2IDX(det,ring,sec,str) \ + (det * 10000 + (ring == 'I' ? 0 : 1000) + str) + +//__________________________________________________________________ +void +AliFMDParameters::Draw(Option_t* option) +{ + TString opt(option); + enum { + kPulseGain, // Path to PulseGain calib object + kThreshold, // Path to PulseGain calib object + kPedestal, // Path to Pedestal calib object + kPedestalWidth, // Path to Pedestal calib object + kDead, // Path to Dead calib object + kSampleRate, // Path to SampleRate calib object + kAltroMap, // Path to AltroMap calib object + kZeroSuppression, // Path to ZeroSuppression cal object + kMinStripRange, // Path to strip range cal object + kMaxStripRange // Path to strip range cal object + } what; + + + if (opt.Contains("dead", TString::kIgnoreCase)) + what = kDead; + else if (opt.Contains("threshold",TString::kIgnoreCase)) + what = kThreshold; + else if (opt.Contains("gain",TString::kIgnoreCase)) + what = kPulseGain; + else if (opt.Contains("pedestal",TString::kIgnoreCase)) + what = kPedestal; + else if (opt.Contains("noise",TString::kIgnoreCase)) + what = kPedestalWidth; + else if (opt.Contains("zero",TString::kIgnoreCase)) + what = kZeroSuppression; + else if (opt.Contains("rate",TString::kIgnoreCase)) + what = kSampleRate; + else if (opt.Contains("min",TString::kIgnoreCase)) + what = kMinStripRange; + else if (opt.Contains("max",TString::kIgnoreCase)) + what = kMaxStripRange; + else if (opt.Contains("map",TString::kIgnoreCase)) + what = kAltroMap; + else { + Warning("Draw", "unknown parameter: %s\n\tShould be one of\n\t" + "dead, threshold, gain, pedestal, noise, zero, rate, " + "min, max, map", + option); + return; + } + + TArrayD xbins(3 * 512 + 2 * 256 + 5); + Int_t i = 1; + Bool_t skip = kTRUE; + for (UShort_t det = 1; det <= 3; det++) { + UShort_t nRings = (det == 1 ? 1 : 2); + for (UShort_t iring = 0; iring < nRings; iring++) { + UShort_t nStrip = (iring == 0 ? 512 : 256); + Char_t ring = (iring == 0 ? 'I' : 'O'); + for (UShort_t str = 0; str < nStrip; str++) { + Int_t idx = DET2IDX(det, ring, 0, str); + if (skip) { + xbins[i-1] = idx - .5; + skip = kFALSE; + } + xbins[i] = idx + .5; + i++; + } + skip = kTRUE; + i++; + } + } + TArrayD ybins(41); + for (Int_t i = 0; i < 41; i++) ybins[i] = Float_t(i - .5); + TH2D* hist = new TH2D("calib", Form("Calibration %s", option), + xbins.fN-1, xbins.fArray, + ybins.fN-1, ybins.fArray); + + // hist->Draw("Lego"); + // return; + + for (UShort_t det = 1; det <= 3; det++) { + UShort_t nRings = (det == 1 ? 1 : 2); + for (UShort_t iring = 0; iring < nRings; iring++) { + UShort_t nSector = (iring == 0 ? 20 : 40); + UShort_t nStrip = (iring == 0 ? 512 : 256); + Char_t ring = (iring == 0 ? 'I' : 'O'); + for (UShort_t sec = 0; sec < nSector; sec++) { + for (UShort_t str = 0; str < nStrip; str++) { + Int_t idx = DET2IDX(det, ring, sec, str); + UInt_t ddl, addr; + Double_t val = 0; + switch (what) { + case kPulseGain: // Path to PulseGain calib object + val = GetPulseGain(det,ring,sec,str); break; + case kThreshold: // Path to PulseGain calib object + val = GetThreshold(); break; + case kPedestal: // Path to Pedestal calib object + val = GetPedestal(det,ring,sec,str); break; + case kPedestalWidth: // Path to Pedestal calib object + val = GetPedestalWidth(det,ring,sec,str); break; + case kDead: // Path to Dead calib object + val = IsDead(det,ring,sec,str); break; + case kSampleRate: // Path to SampleRate calib object + val = GetSampleRate(det,ring,sec,str); break; + case kAltroMap: // Path to AltroMap calib object + Detector2Hardware(det,ring,sec,str, ddl, addr); + val = addr; break; + case kZeroSuppression: // Path to ZeroSuppression cal object + val = GetZeroSuppression(det,ring,sec,str); break; + case kMinStripRange: // Path to strip range cal object + val = GetMinStrip(det,ring,sec,str); break; + case kMaxStripRange: // Path to strip range cal object + val = GetMaxStrip(det,ring,sec,str); break; + } + hist->Fill(idx,sec,val); + } + } + } + } + hist->Draw("lego"); +} + //__________________________________________________________________ void AliFMDParameters::Print(Option_t* option) const diff --git a/FMD/AliFMDParameters.h b/FMD/AliFMDParameters.h index 3a465daae7d..66b6c1bbd7e 100644 --- a/FMD/AliFMDParameters.h +++ b/FMD/AliFMDParameters.h @@ -86,6 +86,20 @@ public: /** Print all parameters. @param option Option string */ void Print(Option_t* option="A") const; + /** Draw parameters. + @param option What to draw. Should be one of + - dead Dead channels + - threshold Threshold + - gain Gain + - pedestal Pedestal + - noise Noise (or pedestal width) + - zero Zero suppression + - rate Sampling rate (VA1 clock / ALTRO clock) + - min Minimum strip read out + - max Maximum strip read out + - map hardware address + */ + void Draw(Option_t* option="pedestal"); /** @{ */ /** @name Set various `Fixed' parameters */ diff --git a/FMD/AliFMDPoints.h b/FMD/AliFMDPoints.h index 46a24f97375..72379f13c16 100644 --- a/FMD/AliFMDPoints.h +++ b/FMD/AliFMDPoints.h @@ -13,6 +13,13 @@ @brief Specialised class for drawing hits in the FMD. @ingroup FMD_sim */ +//____________________________________________________________________ +// +// AliFMDPoints. +// Class to draw FMD Hits. +// Normally, hits are drawn using TPolyMarker3D. However, that's not +// really appropriate for the FMD. Instead, we use TMarker3DBox. +// #ifndef ALIPOINTS_H # include #endif diff --git a/FMD/AliFMDRawReader.cxx b/FMD/AliFMDRawReader.cxx index c76950e37a5..c58bb7c18fd 100644 --- a/FMD/AliFMDRawReader.cxx +++ b/FMD/AliFMDRawReader.cxx @@ -50,7 +50,7 @@ #include "AliFMDParameters.h" // ALIFMDPARAMETERS_H #include "AliFMDDigit.h" // ALIFMDDIGIT_H #include "AliFMDRawStream.h" // ALIFMDRAWSTREAM_H -#include "AliRawReader.h" // ALIRAWREADER_H +// #include "AliRawReader.h" // ALIRAWREADER_H #include "AliFMDRawReader.h" // ALIFMDRAWREADER_H // #include "AliFMDAltroIO.h" // ALIFMDALTROIO_H // #include // ROOT_TArrayI diff --git a/FMD/AliFMDRawStream.h b/FMD/AliFMDRawStream.h index f134e0d207b..897224a06d8 100644 --- a/FMD/AliFMDRawStream.h +++ b/FMD/AliFMDRawStream.h @@ -7,6 +7,14 @@ * * See cxx source for full Copyright notice */ +//____________________________________________________________________ +// +// Class to read ALTRO formated data from an AliRawReader. +// This class is mostly here to set AliAltroRawStream::fNoAltroMapping +// to false. Furthermore, it defines the utility function +// ReadChannel to read in a full ALTRO channel. The data is unpacked +// into the passed array. +// /** @file AliFMDRawStream.h @author Christian Holm Christensen @date Tue Mar 28 12:53:26 2006 diff --git a/FMD/AliFMDReconstructor.cxx b/FMD/AliFMDReconstructor.cxx index 788655eb71a..ea8e2cd4d3d 100644 --- a/FMD/AliFMDReconstructor.cxx +++ b/FMD/AliFMDReconstructor.cxx @@ -21,10 +21,10 @@ //____________________________________________________________________ // // This is a class that constructs AliFMDRecPoint objects from of Digits -// -// This class reads either digits from a TClonesArray or raw data from +// This class reads either digits from a TClonesArray or raw data from // a DDL file (or similar), and stores the read ADC counts in an -// internal cache (fAdcs). +// internal cache (fAdcs). The rec-points are made via the naiive +// method. // //-- Authors: Evgeny Karpechev(INR) and Alla Maevsksia // Latest changes by Christian Holm Christensen @@ -33,7 +33,7 @@ //____________________________________________________________________ #include // ALILOG_H -#include // ALIRUN_H +// #include // ALIRUN_H #include // ALIRUNLOADER_H #include // ALIHEADER_H #include // ALIGENEVENTHEADER_H diff --git a/FMD/AliFMDRing.cxx b/FMD/AliFMDRing.cxx index da598669999..78db3450481 100644 --- a/FMD/AliFMDRing.cxx +++ b/FMD/AliFMDRing.cxx @@ -21,8 +21,7 @@ //__________________________________________________________________ // // Utility class to help implement collection of FMD modules into -// rings. This is used by AliFMDDetector and AliFMDGeometry. -// +// rings. This is used by AliFMDDetector and AliFMDGeometry. // The AliFMDGeometry object owns the AliFMDRing objects, and the // AliFMDDetector objects reference these. That is, the AliFMDRing // objects are share amoung the AliFMDDetector objects. diff --git a/FMD/AliFMDSDigitizer.cxx b/FMD/AliFMDSDigitizer.cxx index 70c4ca31413..af6f8e4a9e7 100644 --- a/FMD/AliFMDSDigitizer.cxx +++ b/FMD/AliFMDSDigitizer.cxx @@ -196,18 +196,18 @@ // -1 + B + exp(-B) // -#include // ROOT_TTree +// #include // ROOT_TTree //#include // ROOT_TRandom #include // ALILOG_H #include "AliFMDSDigitizer.h" // ALIFMDDIGITIZER_H #include "AliFMD.h" // ALIFMD_H -#include "AliFMDGeometry.h" // ALIFMDGEOMETRY_H -#include "AliFMDDetector.h" // ALIFMDDETECTOR_H -#include "AliFMDRing.h" // ALIFMDRING_H +// #include "AliFMDGeometry.h" // ALIFMDGEOMETRY_H +// #include "AliFMDDetector.h" // ALIFMDDETECTOR_H +// #include "AliFMDRing.h" // ALIFMDRING_H #include "AliFMDHit.h" // ALIFMDHIT_H -#include "AliFMDDigit.h" // ALIFMDDIGIT_H -#include "AliFMDParameters.h" // ALIFMDPARAMETERS_H -#include // ALIRUNDIGITIZER_H +// #include "AliFMDDigit.h" // ALIFMDDIGIT_H +// #include "AliFMDParameters.h" // ALIFMDPARAMETERS_H +// #include // ALIRUNDIGITIZER_H #include // ALIRUN_H #include // ALILOADER_H #include // ALIRUNLOADER_H diff --git a/FMD/AliFMDv1.cxx b/FMD/AliFMDv1.cxx index e521452285f..af928dec4ef 100644 --- a/FMD/AliFMDv1.cxx +++ b/FMD/AliFMDv1.cxx @@ -26,7 +26,6 @@ // contains the base procedures for the Forward Multiplicity detector // Detector consists of 3 sub-detectors FMD1, FMD2, and FMD3, each of // which has 1 or 2 rings of silicon sensors. -// // This class contains the detailed version of the FMD - that is, hits // are produced during simulation. // diff --git a/FMD/Config.C b/FMD/Config.C index fee5cfea8ba..6f13d2de32e 100644 --- a/FMD/Config.C +++ b/FMD/Config.C @@ -228,9 +228,10 @@ Config() { //____________________________________________________________________ // This part for configuration - //static EG_t eg = test50; - //EG_t eg = kParam_fmd; - EG_t eg = kParam_2000; // kPythia; + // EG_t eg = test50; + // EG_t eg = kParam_fmd; + // EG_t eg = kParam_2000; // kPythia; + EG_t eg = kFMDFlat; Geo_t geo = kNoHoles; Rad_t rad = kGluonRadiation; Mag_t mag = k5kG; @@ -1612,18 +1613,20 @@ GeneratorFactory(EG_t eg, Rad_t rad, TString& comment) case kFMDFlat: { comment = comment.Append(" Flat in FMD range"); - AliGenCocktail* gener = AliGenCocktail("FMD cocktail"); - gener->SetPart(211); + AliGenCocktail* gener = new AliGenCocktail(); gener->SetMomentumRange(3,4); gener->SetPhiRange(0, 360); AliGenBox* gener3 = new AliGenBox(2000); gener3->SetThetaRange(155.97, 176.73); + gener3->SetPart(211); gener->AddGenerator(gener3, "FMD3", .33); AliGenBox* gener2 = new AliGenBox(2000); gener2->SetThetaRange(2.95, 20.42); + gener2->SetPart(211); gener->AddGenerator(gener2, "FMD2", .33); AliGenBox* gener1 = new AliGenBox(2000); gener1->SetThetaRange(0.77, 3.08); + gener1->SetPart(211); gener->AddGenerator(gener1, "FMD1", .34); gGener = gener; } diff --git a/STEER/AliESDFMD.cxx b/STEER/AliESDFMD.cxx index d84965e4a00..49f49a2c5c9 100755 --- a/STEER/AliESDFMD.cxx +++ b/STEER/AliESDFMD.cxx @@ -134,6 +134,7 @@ AliESDFMD::SetEta(UShort_t detector, Char_t ring, UShort_t /* sector */, void AliESDFMD::Print(Option_t* /* option*/) const { + // Print all information to standard output. std::cout << "AliESDFMD:" << std::endl; for (size_t det = 1; det <= fMultiplicity.MaxDetectors(); det++) { for (size_t ir = 0; ir < fMultiplicity.MaxRings(); ir++) { diff --git a/STEER/AliESDFMD.h b/STEER/AliESDFMD.h index 96adb5432dc..a4c59dafb56 100755 --- a/STEER/AliESDFMD.h +++ b/STEER/AliESDFMD.h @@ -53,8 +53,8 @@ public: kInvalidEta = 1000 }; protected: - AliFMDFloatMap fMultiplicity; - AliFMDFloatMap fEta; + AliFMDFloatMap fMultiplicity; // Psuedo multplicity per strip + AliFMDFloatMap fEta; // Psuedo-rapidity per strip ClassDef(AliESDFMD,1) // ESD info from FMD }; diff --git a/STEER/AliFMDFloatMap.cxx b/STEER/AliFMDFloatMap.cxx index dbe33866f90..0522dcd3e17 100755 --- a/STEER/AliFMDFloatMap.cxx +++ b/STEER/AliFMDFloatMap.cxx @@ -18,6 +18,12 @@ //__________________________________________________________ // // Map of per strip Float_t information +// the floats are indexed by the coordinates +// DETECTOR # (1-3) +// RING ID ('I' or 'O', any case) +// SECTOR # (0-39) +// STRIP # (0-511) +// // // Created Mon Nov 8 12:51:51 2004 by Christian Holm Christensen // diff --git a/STEER/AliFMDFloatMap.h b/STEER/AliFMDFloatMap.h index a61792532e4..30d6fe2444c 100755 --- a/STEER/AliFMDFloatMap.h +++ b/STEER/AliFMDFloatMap.h @@ -11,6 +11,11 @@ //____________________________________________________________________ // // Array of floats indexed by strip identifier. +// the floats are indexed by the coordinates +// DETECTOR # (1-3) +// RING ID ('I' or 'O', any case) +// SECTOR # (0-39) +// STRIP # (0-511) // class AliFMDFloatMap : public AliFMDMap { -- 2.43.0