// These files are not in the same directory, so there's no reason to
// ask the preprocessor to search in the current directory for these
// files by including them with `#include "..."'
-// #include <math.h> // __CMATH__
+#include <cmath> // __CMATH__
#include <TClonesArray.h> // ROOT_TClonesArray
#include <TGeometry.h> // ROOT_TGeomtry
#include <TNode.h> // ROOT_TNode
#include <TTUBE.h> // ROOT_TTUBE
#include <TTree.h> // ROOT_TTree
#include <TBrowser.h> // ROOT_TBrowser
-// #include <TVirtualMC.h> // ROOT_TVirtualMC
+#include <TVirtualMC.h> // ROOT_TVirtualMC
#include <TVector2.h> // ROOT_TVector2
#include <TGeoManager.h> // ROOT_TGeoManager
#include <AliRun.h> // ALIRUN_H
#include <AliMC.h> // ALIMC_H
#include <AliMagF.h> // ALIMAGF_H
-#include <AliLog.h> // ALILOG_H
+// #include <AliLog.h> // ALILOG_H
+#include "AliFMDDebug.h" // Better debug macros
#include "AliFMD.h" // ALIFMD_H
#include "AliFMDDigit.h" // ALIFMDDIGIT_H
#include "AliFMDSDigit.h" // ALIFMDSDIGIT_H
#include "AliFMDDetector.h" // ALIFMDDETECTOR_H
#include "AliFMDRing.h" // ALIFMDRING_H
#include "AliFMDDigitizer.h" // ALIFMDDIGITIZER_H
-#include "AliFMDSDigitizer.h" // ALIFMDSDIGITIZER_H
+#include "AliFMDHitDigitizer.h" // ALIFMDSDIGITIZER_H
+// #define USE_SSDIGITIZER
+//#ifdef USE_SSDIGITIZER
+//# include "AliFMDSSDigitizer.h" // ALIFMDSDIGITIZER_H
+//#endif
// #include "AliFMDGeometryBuilder.h"
#include "AliFMDRawWriter.h" // ALIFMDRAWWRITER_H
#include "AliFMDPoints.h" // ALIFMDPOINTS_H
//
// Default constructor for class AliFMD
//
- AliDebug(10, "\tDefault CTOR");
+ AliFMDDebug(10, ("\tDefault CTOR"));
fHits = 0;
fDigits = 0;
fIshunt = 0;
fBad = new TClonesArray("AliFMDHit");
}
-//____________________________________________________________________
-AliFMD::AliFMD(const AliFMD& other)
- : AliDetector(other),
- fSDigits(other.fSDigits),
- fNsdigits(other.fNsdigits),
- fDetailed(other.fDetailed),
- fUseOld(other.fUseOld),
- fUseAssembly(other.fUseAssembly),
- fBad(other.fBad)
-{
- // Copy constructor
-}
-
//____________________________________________________________________
AliFMD::AliFMD(const char *name, const char *title)
: AliDetector (name, title),
//
// Standard constructor for Forward Multiplicity Detector
//
- AliDebug(10, "\tStandard CTOR");
+ AliFMDDebug(10, ("\tStandard CTOR"));
fBad = new TClonesArray("AliFMDHit");
// Initialise Hit array
// CHC: What is this?
fIshunt = 0;
- SetMarkerColor(kRed);
- SetLineColor(kYellow);
+ //PH SetMarkerColor(kRed);
+ //PH SetLineColor(kYellow);
}
//____________________________________________________________________
}
}
-//____________________________________________________________________
-AliFMD&
-AliFMD::operator=(const AliFMD& other)
-{
- // Assignment operator
- AliDetector::operator=(other);
- fSDigits = other.fSDigits;
- fNsdigits = other.fNsdigits;
- fDetailed = other.fDetailed;
- fBad = other.fBad;
- return *this;
-}
//====================================================================
//
// TGeoManager, and registers the mediums here. Alas, it's not
// really that easy.
//
- AliDebug(10, "\tCreating materials");
+ AliFMDDebug(10, ("\tCreating materials"));
// Get pointer to geometry singleton object.
AliFMDGeometry* geometry = AliFMDGeometry::Instance();
geometry->Init();
maxStepSize,maxEnergyLoss,precision,minStepSize);
}
+ // Stainless steel
+ {
+ Float_t as[] = { 55.847, 51.9961, 58.6934, 28.0855 };
+ Float_t zs[] = { 26., 24., 28., 14. };
+ Float_t ws[] = { .715, .18, .1, .005 };
+ density = 7.88;
+ id = kSteelId;
+ AliMixture(id, "Steel$", as, zs, density, 4, ws);
+ AliMedium(kSteelId, "Steel$", id, 0, fieldType, maxField, maxBending,
+ maxStepSize, maxEnergyLoss, precision, minStepSize);
+ }
// Plastic
{
Float_t as[] = { 1.01, 12.01 };
AliMedium(kPlasticId, "Plastic$", id,0,fieldType,maxField,maxBending,
maxStepSize,maxEnergyLoss,precision,minStepSize);
}
+
}
//____________________________________________________________________
{
// Initialize the detector
//
- AliDebug(1, "Initialising FMD detector object");
- // AliFMDGeometry* fmd = AliFMDGeometry::Instance();
+ AliFMDDebug(1, ("Initialising FMD detector object"));
+ TVirtualMC* mc = TVirtualMC::GetMC();
+ AliFMDGeometry* fmd = AliFMDGeometry::Instance();
+ const TArrayI& actGeo = fmd->ActiveIds();
+ TArrayI actVmc(actGeo.fN);
+ for (Int_t i = 0; i < actGeo.fN; i++) {
+ TGeoVolume *sens = gGeoManager->GetVolume(actGeo[i]);
+ if (!sens) {
+ AliError(Form("No TGeo volume for sensitive volume ID=%d",actGeo[i]));
+ continue;
+ }
+ actVmc[i] = mc->VolId(sens->GetName());
+ AliFMDDebug(1, ("Active vol id # %d: %d changed to %d",
+ i, actGeo[i], actVmc[i]));
+ }
+ fmd->SetActive(actVmc.fArray, actVmc.fN);
// fmd->InitTransformations();
}
//
// Build simple ROOT TNode geometry for event display. With the new
// geometry modeller, TGeoManager, this seems rather redundant.
- AliDebug(10, "\tCreating a simplified geometry");
+ AliFMDDebug(10, ("\tCreating a simplified geometry"));
AliFMDGeometry* fmd = AliFMDGeometry::Instance();
}
shape->DefineSection(0, -siThick / 2, 1, 0, 0);
shape->DefineSection(1, +siThick / 2, 1, 0, 0);
- shape->SetLineColor(GetLineColor());
+ shape->SetLineColor(kYellow); //PH kYellow is the default line color in FMD
TObjArray* rots = new TObjArray(nmod);
for (Int_t j = 0; j < nmod; j++) {
TNode* mnod = new TNode(name.Data(), title.Data(), rshape,
0, 0, rz - siThick / 2
+ TMath::Sign(offz,z), rot);
- mnod->SetLineColor(GetLineColor());
+ mnod->SetLineColor(kYellow); //PH kYellow is the default line color in FMD
fNodes->Add(mnod);
} // for (Int_t k = 0 ; ...)
} // for (Int_t j = 0 ; ...)
// than 1 keV - a MIP is 100 eV.
if (edep > absQ * absQ && poverm > 1) bad = kTRUE;
- AliFMDPoints* p1 = new AliFMDPoints(hit, GetMarkerColor());
+ AliFMDPoints* p1 = new AliFMDPoints(hit, kRed); //PH kRed is the default marker color in FMD
// AliPoints* p1 = new AliPoints();
// p1->SetMarkerColor(GetMarkerColor());
// p1->SetMarkerSize(GetMarkerSize());
{
// Draw a shaded view of the Forward multiplicity detector. This
// isn't really useful anymore.
- AliDebug(10, "\tDraw detector");
+ AliFMDDebug(10, ("\tDraw detector"));
}
//____________________________________________________________________
// Set the TClonesArray to read hits into.
b->SetAddress(&fHits);
}
+//____________________________________________________________________
+void
+AliFMD::SetSDigitsAddressBranch(TBranch *b)
+{
+ // Set the TClonesArray to read hits into.
+ b->SetAddress(&fSDigits);
+}
//____________________________________________________________________
void
&& hit->Sector() == sector
&& hit->Strip() == strip
&& hit->Track() == track) {
- AliDebug(1, Form("already had a hit in FMD%d%c[%2d,%3d] for track # %d,"
+ AliFMDDebug(1, ("already had a hit in FMD%d%c[%2d,%3d] for track # %d,"
" adding energy (%f) to that hit (%f) -> %f",
detector, ring, sector, strip, track, edep, hit->Edep(),
hit->Edep() + edep));
UShort_t(digits[3]), // Strip #
UShort_t(digits[4]), // ADC Count1
Short_t(digits[5]), // ADC Count2
- Short_t(digits[6])); // ADC Count3
+ Short_t(digits[6]), // ADC Count3
+ Short_t(digits[7]));
}
//____________________________________________________________________
UShort_t strip,
UShort_t count1,
Short_t count2,
- Short_t count3)
+ Short_t count3,
+ Short_t count4)
{
// add a real digit - as coming from data
//
TClonesArray& a = *(DigitsArray());
new (a[fNdigits++])
- AliFMDDigit(detector, ring, sector, strip, count1, count2, count3);
+ AliFMDDigit(detector, ring, sector, strip, count1, count2, count3, count4);
+ AliFMDDebug(15, ("Adding digit # %5d/%5d for FMD%d%c[%2d,%3d]=(%d,%d,%d,%d)",
+ fNdigits-1, a.GetEntriesFast(),
+ detector, ring, sector, strip,
+ count1, count2, count3, count4));
+
}
//____________________________________________________________________
Float_t(digits[4]), // Edep
UShort_t(digits[5]), // ADC Count1
Short_t(digits[6]), // ADC Count2
- Short_t(digits[7])); // ADC Count3
+ Short_t(digits[7]), // ADC Count3
+ Short_t(digits[8]));
}
//____________________________________________________________________
Float_t edep,
UShort_t count1,
Short_t count2,
- Short_t count3)
+ Short_t count3,
+ Short_t count4)
{
// add a summable digit
//
// count3 ADC count (a 10-bit word), or -1 if not used
//
TClonesArray& a = *(SDigitsArray());
+ // AliFMDDebug(0, ("Adding sdigit # %d", fNsdigits));
new (a[fNsdigits++])
- AliFMDSDigit(detector, ring, sector, strip, edep, count1, count2, count3);
+ AliFMDSDigit(detector, ring, sector, strip, edep,
+ count1, count2, count3, count4);
}
//____________________________________________________________________
// Create AliFMDDigit's from AliFMDHit's. This is done by making a
// AliFMDDigitizer, and executing that code.
//
- Warning("Hits2Digits", "Try not to use this method.\n"
- "Instead, use AliSimulator");
- AliRunDigitizer* manager = new AliRunDigitizer(1, 1);
- manager->SetInputStream(0, "galice.root");
- manager->SetOutputFile("H2Dfile");
-
- /* AliDigitizer* dig =*/ CreateDigitizer(manager);
- manager->Exec("");
- delete manager;
+ AliFMDHitDigitizer digitizer(this, AliFMDHitDigitizer::kDigits);
+ digitizer.Init();
+ digitizer.Exec("");
}
//____________________________________________________________________
// Create AliFMDSDigit's from AliFMDHit's. This is done by creating
// an AliFMDSDigitizer object, and executing it.
//
- AliFMDSDigitizer* digitizer = new AliFMDSDigitizer("galice.root");
- digitizer->Exec("");
- delete digitizer;
+ AliFMDHitDigitizer digitizer(this, AliFMDHitDigitizer::kSDigits);
+ digitizer.Init();
+ digitizer.Exec("");
}
AliFMD::CreateDigitizer(AliRunDigitizer* manager) const
{
// Create a digitizer object
- AliFMDDigitizer* digitizer = new AliFMDDigitizer(manager);
+
+ /* This is what we probably _should_ do */
+ AliFMDBaseDigitizer* digitizer = 0;
+
+#ifdef USE_SSDIGITIZER
+ digitizer = new AliFMDSSDigitizer(manager);
+#else
+ /* This is what we actually do, and will work */
+#if 0
+ AliInfo("SDigit->Digit conversion not really supported, "
+ "doing Hit->Digit conversion instead");
+#endif
+ digitizer = new AliFMDDigitizer(manager);
+#endif
return digitizer;
}
{
// Browse this object.
//
- AliDebug(30, "\tBrowsing the FMD");
+ AliFMDDebug(30, ("\tBrowsing the FMD"));
AliDetector::Browse(b);
b->Add(AliFMDGeometry::Instance());
}
// This code was made by Raffaele Grosso <rgrosso@mail.cern.ch>. I
// (cholm) will probably want to change it. For one, I think it
// should be the job of the geometry manager to deal with this.
+ AliInfo("Add FMD alignable volumes");
+ AliFMDGeometry::Instance()->SetAlignableVolumes();
+#if 0
for(size_t f = 1; f <= 3; f++){ // Detector 1,2,3
for(size_t tb = 0; tb <2 ; tb++){ // Top/Bottom
char stb = tb == 0 ? 'T' : 'B';
unsigned min = tb == 0 ? 0 : 5;
- TString halfVol(Form("/ALIC/F%dM%c_%d", f, stb, f));
+ TString halfVol(Form("/ALIC_1/F%dM%c_%d", f, stb, f));
TString halfSym(halfVol);
if(!gGeoManager->SetAlignableEntry(halfSym.Data(),halfVol.Data()))
AliFatal(Form("Alignable entry %s not created. "
halfSym.Data(),halfVol.Data()));
for(size_t io = 0; io < 2; io++){ // inner, outer
if (f==1 && io==1) continue; // Only one ring in FMD1
- min = (tb == 1 ? 10 : min);
- char sio = (io == 0 ? 'I' : '0');
+ if(tb == 1 && io==1) min=10;
+ char sio = (io == 0 ? 'I' : 'O');
unsigned nio = (io == 0 ? 3 : 9);
unsigned max = (io == 0 ? 5 : 10) + min;
}
}
}
-
+#endif
}
//___________________________________________________________________
//
git://git.uio.no / u / mrichter / AliRoot.git / blobdiff