X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=FMD%2FAliFMDPattern.cxx;h=22d2690de7bc382c46872286306f0c735b33d120;hb=5ab640ac724343c55bab6a8fa7304a104e48ba1c;hp=800ee2b66f61c0a41e463aa1da7ce6748ba1ff1c;hpb=e1a9aea4fc25ed42164ccc4fdb3a7972b27f3cf2;p=u%2Fmrichter%2FAliRoot.git diff --git a/FMD/AliFMDPattern.cxx b/FMD/AliFMDPattern.cxx index 800ee2b66f6..22d2690de7b 100644 --- a/FMD/AliFMDPattern.cxx +++ b/FMD/AliFMDPattern.cxx @@ -50,8 +50,12 @@ #include "AliFMDRing.h" // #include "AliFMDDetector.h" #include "AliFMDHit.h" +#include "AliMultiplicity.h" +#include "AliESDEvent.h" +#include "AliESDVertex.h" // #include #include "AliFMDDebug.h" // Better debug macros +// #include "AliPhysicsSelection.h" class AliFMDDetector; //____________________________________________________________________ @@ -87,7 +91,7 @@ AliFMDPattern::AliFMDPatternDetector::~AliFMDPatternDetector() //____________________________________________________________________ void -AliFMDPattern::AliFMDPatternDetector::DrawShape(TObjArray& a) +AliFMDPattern::AliFMDPatternDetector::DrawShape(const TObjArray& a) { // Draw all shapes. // @@ -105,12 +109,22 @@ AliFMDPattern::AliFMDPatternDetector::DrawShape(TObjArray& a) //____________________________________________________________________ void -AliFMDPattern::AliFMDPatternDetector::CopyShapes(TObjArray& src, +AliFMDPattern::AliFMDPatternDetector::CopyShapes(const TObjArray& src, TObjArray& dest, Double_t ang, Double_t fx, Double_t fy) { + // + // Copy shapes + // + // Parameters: + // input Source + // own Ours + // ang Angle + // fx Factor x + // fy Factor y + // TIter next(&src); TGraph* g = 0; while ((g = static_cast(next()))) { @@ -217,6 +231,8 @@ AliFMDPattern::AliFMDPatternDetector::End() // Simply resets number of points at each level to // the seen number of hits at that level. // Avoid deleting memory. + + TIter next(&fGraphs); TGraph* g = 0; Int_t i = 0; @@ -248,8 +264,9 @@ AliFMDPattern::AliFMDPatternDetector::AddMarker(Double_t x, // X,Y,Z Coordiantes // MAX Maximum value. // - /** Sigh, for some odd reason, the code-checker does not recognise - this a usage of the TMath namespace declaration! Idiot */ + // Sigh, for some odd reason, the code-checker does not recognise + // this a usage of the TMath namespace declaration! Idiot + // Int_t i = TMath::Min(Int_t(fCounts.fN * s / max), Int_t(fGraphs.GetEntries()-1)); if (i < 0 || i >= fCounts.fN) { @@ -286,7 +303,7 @@ AliFMDPattern::AliFMDPattern(const char* gAliceFile) fTotal(.2, .35, "Total: "), fFMD1Area(0), fFMD2Area(0), - fFMD3Area(0) + fFMD3Area(0)// ,fPhysicsSelection(0) { // Constructor. // @@ -297,7 +314,7 @@ AliFMDPattern::AliFMDPattern(const char* gAliceFile) SetName("AliFMDPattern"); SetName("2D display of FMD data"); - + // fPhysicsSelection = new AliPhysicsSelection(); // RemoveLoad(kGeometry); fEvent.SetBit(TLatex::kTextNDC); fFMD1Sum.SetBit(TLatex::kTextNDC); @@ -452,6 +469,17 @@ AliFMDPattern::Begin(Int_t event) fFMD1.Clear(); fFMD2.Clear(); fFMD3.Clear(); + +#if 0 + TString triggers = fESDEvent->GetFiredTriggerClasses(); + const AliESDVertex* vertex = fESDEvent->GetPrimaryVertexSPD(); + Double_t vertexXYZ[3]; + vertex->GetXYZ(vertexXYZ); + const AliMultiplicity* mult = fESDEvent->GetMultiplicity(); + Int_t nTrackLets = mult->GetNumberOfTracklets(); + std::cout<IsCollisionCandidate(fESDEvent)<<" "<