From c4ee792dc7a453b2f8639fe20c333afaf9ee5648 Mon Sep 17 00:00:00 2001 From: ivana Date: Thu, 15 Mar 2007 21:03:10 +0000 Subject: [PATCH] Updated comments for Doxygen --- MUON/AliMUON.h | 2 + MUON/AliMUON2DMapIterator.cxx | 18 +-- MUON/AliMUON2DMapIterator.h | 16 +-- MUON/AliMUON2DStoreValidator.h | 10 +- MUON/AliMUONAlignment.h | 148 ++++++++++++------------ MUON/AliMUONChamber.h | 5 +- MUON/AliMUONChamberTrigger.cxx | 2 +- MUON/AliMUONChamberTrigger.h | 2 + MUON/AliMUONCheck.h | 2 + MUON/AliMUONCheckItem.h | 4 + MUON/AliMUONClusterDrawAZ.h | 5 +- MUON/AliMUONClusterFinderAZ.h | 33 ++++-- MUON/AliMUONClusterFinderVS.h | 19 +-- MUON/AliMUONClusterInput.h | 15 +++ MUON/AliMUONConstants.cxx | 1 + MUON/AliMUONData.cxx | 4 +- MUON/AliMUONData.h | 6 +- MUON/AliMUONDigitizerV3.cxx | 1 + MUON/AliMUONEventRecoCombi.h | 1 + MUON/AliMUONGeometryEnvelope.cxx | 2 +- MUON/AliMUONGeometryModuleTransformer.h | 2 +- MUON/AliMUONGeometrySegmentation.cxx | 4 +- MUON/AliMUONGlobalTriggerBoard.cxx | 12 +- MUON/AliMUONGlobalTriggerBoard.h | 4 +- MUON/AliMUONHitForRec.h | 2 + MUON/AliMUONPixel.cxx | 11 +- MUON/AliMUONPixel.h | 2 +- MUON/AliMUONRawStreamTracker.cxx | 4 + MUON/AliMUONRawStreamTracker.h | 8 +- MUON/AliMUONRawStreamTrigger.cxx | 3 + MUON/AliMUONRawStreamTrigger.h | 8 +- MUON/AliMUONRecoTrack.cxx | 11 +- MUON/AliMUONRecoTrack.h | 2 +- MUON/AliMUONRegionalTriggerBoard.cxx | 12 +- MUON/AliMUONRegionalTriggerBoard.h | 6 +- MUON/AliMUONResponseTriggerV1.cxx | 3 +- MUON/AliMUONResponseV0.h | 8 +- MUON/AliMUONVTrackReconstructor.cxx | 4 +- MUON/AliMUONVTrackReconstructor.h | 4 +- MUON/AliMillepede.h | 94 +++++++-------- 40 files changed, 280 insertions(+), 220 deletions(-) diff --git a/MUON/AliMUON.h b/MUON/AliMUON.h index f46d628ea3c..c3dfbe5a6e0 100644 --- a/MUON/AliMUON.h +++ b/MUON/AliMUON.h @@ -150,7 +150,9 @@ class AliMUON : public AliDetector //PH virtual void RemapTrackHitIDs(Int_t * map); protected: + /// Not implemented AliMUON(const AliMUON& rMUON); + /// Not implemented AliMUON& operator = (const AliMUON& rhs); const AliMUONGeometry* GetGeometry() const; diff --git a/MUON/AliMUON2DMapIterator.cxx b/MUON/AliMUON2DMapIterator.cxx index fb282bca16e..ef5ed061731 100644 --- a/MUON/AliMUON2DMapIterator.cxx +++ b/MUON/AliMUON2DMapIterator.cxx @@ -41,14 +41,14 @@ fIter2(0x0), fCurrentI(-1), fCurrentJ(-1) { - // default ctor + /// default ctor Reset(); } //_____________________________________________________________________________ AliMUON2DMapIterator::~AliMUON2DMapIterator() { - // dtor + /// dtor delete fIter2; } @@ -56,7 +56,7 @@ AliMUON2DMapIterator::~AliMUON2DMapIterator() TObject* AliMUON2DMapIterator::GetValue(TExMapIter& iter, Int_t& theKey) const { - // return the value corresponding to theKey in iterator iter + /// return the value corresponding to theKey in iterator iter theKey = -1; Long_t key, value; Bool_t ok = iter.Next(key,value); @@ -69,7 +69,7 @@ AliMUON2DMapIterator::GetValue(TExMapIter& iter, Int_t& theKey) const AliMpExMap* AliMUON2DMapIterator::GetMap(TExMapIter& iter, Int_t& key) { - // get the map corresponding to key + /// get the map corresponding to key AliMpExMap* rv(0x0); TObject* o = GetValue(iter,key); if (o) @@ -87,9 +87,9 @@ AliMUON2DMapIterator::GetMap(TExMapIter& iter, Int_t& key) TObject* AliMUON2DMapIterator::Next() { - // logic : - // get TObject* from fIter2 - // if null, increment fIter2 by getting next on fIter + /// logic : + /// get TObject* from fIter2 + /// if null, increment fIter2 by getting next on fIter if (!fIter2) return 0x0; @@ -116,7 +116,7 @@ AliMUON2DMapIterator::Next() void AliMUON2DMapIterator::Reset() { - // rewind the iterator + /// rewind the iterator delete fIter2; fIter.Reset(); AliMpExMap* m = GetMap(fIter,fCurrentI); @@ -130,7 +130,7 @@ AliMUON2DMapIterator::Reset() Bool_t AliMUON2DMapIterator::Remove() { - // to be implemented if needed + /// to be implemented if needed AliInfo("Not supported yet"); return kFALSE; } diff --git a/MUON/AliMUON2DMapIterator.h b/MUON/AliMUON2DMapIterator.h index f346d50d868..56d82a4b12c 100644 --- a/MUON/AliMUON2DMapIterator.h +++ b/MUON/AliMUON2DMapIterator.h @@ -44,19 +44,19 @@ public: virtual Bool_t Remove(); private: - // copy ctor will not implemented - AliMUON2DMapIterator(const AliMUON2DMapIterator&); - // assignement operator will not implemented + /// copy ctor will not implemented + AliMUON2DMapIterator(const AliMUON2DMapIterator&); + /// assignement operator will not implemented AliMUON2DMapIterator& operator=(const AliMUON2DMapIterator&); - TObject* GetValue(TExMapIter& iter, Int_t& key) const; + TObject* GetValue(TExMapIter& iter, Int_t& key) const; AliMpExMap* GetMap(TExMapIter& iter, Int_t& key); private: - TExMapIter fIter; //! first iterator - TExMapIter* fIter2; //! second iterator - Int_t fCurrentI; //! current index in direction i - Int_t fCurrentJ; //! current index in direction j + TExMapIter fIter; //!< first iterator + TExMapIter* fIter2; //!< second iterator + Int_t fCurrentI; //!< current index in direction i + Int_t fCurrentJ; //!< current index in direction j ClassDef(AliMUON2DMapIterator,0) // VDataIterator for 2D maps }; diff --git a/MUON/AliMUON2DStoreValidator.h b/MUON/AliMUON2DStoreValidator.h index f5a9f3d9006..7eba3b3c8f3 100644 --- a/MUON/AliMUON2DStoreValidator.h +++ b/MUON/AliMUON2DStoreValidator.h @@ -38,13 +38,15 @@ public: AliMUONV2DStore* GetStatus() const { return fStatus; } + /// Reports what is missing, trying to be as concise as possible. void Report(TList& lines) const; static void Report(TList& lines, const TObjArray& chambers); private: - + /// Not implemented AliMUON2DStoreValidator(const AliMUON2DStoreValidator&); + /// Not implemented AliMUON2DStoreValidator& operator=(const AliMUON2DStoreValidator&); void AddMissingChannel(Int_t detElemId, Int_t manuId, Int_t manuChannel); @@ -60,9 +62,9 @@ private: static void ReportManu(TList& list, AliMUONCheckItem& manu); private: - TList* fManuList; //! List of (DE,manuID) pairs. - TObjArray* fChambers; //! Array of AliMUONCheckItem. - AliMUONV2DStore* fStatus; //! Statuses + TList* fManuList; //!< List of (DE,manuID) pairs. + TObjArray* fChambers; //!< Array of AliMUONCheckItem. + AliMUONV2DStore* fStatus; //!< Statuses ClassDef(AliMUON2DStoreValidator,2) // Validator of 2DStore }; diff --git a/MUON/AliMUONAlignment.h b/MUON/AliMUONAlignment.h index 1701bb77a00..5e12c187282 100644 --- a/MUON/AliMUONAlignment.h +++ b/MUON/AliMUONAlignment.h @@ -29,6 +29,7 @@ public: virtual ~AliMUONAlignment(); void ProcessTrack(AliMUONTrack *track); + /// Set geometry transformer void SetGeometryTransformer(AliMUONGeometryTransformer * transformer) { fTransform = transformer; } @@ -44,9 +45,11 @@ public: void SetNonLinear(Int_t param); void AddConstraint(Double_t *factor, Double_t value ); void InitGlobalParameters(Double_t *par); + /// Set array of local derivatives void SetLocalDerivative(Int_t index, Double_t value) { fLocalDerivatives[index] = value; } + /// Set array of global derivatives void SetGlobalDerivative(Int_t index, Double_t value) { fGlobalDerivatives[index] = value; } @@ -58,12 +61,11 @@ public: AliMUONGeometryTransformer* ReAlign(const AliMUONGeometryTransformer * transformer, double *misAlignments, Bool_t verbose); - protected: + private: + /// Not implemented AliMUONAlignment(const AliMUONAlignment& right); + /// Not implemented AliMUONAlignment& operator = (const AliMUONAlignment& right); - - - private: void Init(Int_t nGlobal, Int_t nLocal, Int_t nStdDev); void ConstrainT(Int_t lDetElem, Int_t lCh, Double_t *lConstraintT, Int_t iVar); @@ -79,77 +81,77 @@ public: TGeoCombiTrans ReAlign(const TGeoCombiTrans& transform, double *detElemMisAlignment) const; - Bool_t fBFieldOn; // Flag for Magnetic filed On/Off + Bool_t fBFieldOn; ///< Flag for Magnetic filed On/Off - Bool_t fDoF[3]; // Flags degrees of freedom to align (x,y,phi) - Double_t fAllowVar[3]; // "Encouraged" variation for degrees of freedom - Double_t fStartFac; // Initial value for chi2 cut - // if > 1 Iterations in AliMillepede are turned on - Double_t fResCutInitial; // Cut on residual for first iteration - Double_t fResCut; // Cut on residual for other iterations - - AliMillepede *fMillepede; // Detector independent alignment class + Bool_t fDoF[3]; ///< Flags degrees of freedom to align (x,y,phi) + Double_t fAllowVar[3]; ///< "Encouraged" variation for degrees of freedom + Double_t fStartFac; ///< Initial value for chi2 cut + ///< if > 1 Iterations in AliMillepede are turned on + Double_t fResCutInitial; ///< Cut on residual for first iteration + Double_t fResCut; ///< Cut on residual for other iterations + + AliMillepede *fMillepede; ///< Detector independent alignment class - TClonesArray *fTrackParamAtHit; // Array of track parameters - TClonesArray *fHitForRecAtHit; // Array of track hits - AliMUONTrack *fTrack; // AliMUONTrack - AliMUONHitForRec *fRecHit; // AliMUONHitForRec - AliMUONTrackParam *fTrackParam; // Track parameters - - Int_t fNGlobal; // Number of global parameters - Int_t fNLocal; // Number of local parameters - Int_t fNStdDev; // Number of standard deviations for chi2 cut - Double_t fClustPos[3]; // Cluster position - Double_t fClustPosLoc[3]; // Cluster position in local coordinates - Double_t fTrackSlope0[2]; // Track slope at reference point - Double_t fTrackSlope[2]; // Track slope at current point - Double_t fTrackPos0[3]; // Track intersection at reference point - Double_t fTrackPos[3]; // Track intersection at current point - Double_t fTrackPosLoc[3]; // Track intersection at current point in local coordinates - Double_t fMeas[2]; // Current measurement (depend on B field On/Off) - Double_t fSigma[2]; // Estimated resolution on measurement - - Double_t fGlobalDerivatives[468]; // Array of global derivatives - Double_t fLocalDerivatives[4]; // Array of local derivatives - - Double_t fConstraintX[468]; // Array for constraint equation all X - Double_t fConstraintY[468]; // Array for constraint equation all Y - Double_t fConstraintP[468]; // Array for constraint equation all P - Double_t fConstraintXT[468]; // Array for constraint equation X Top half - Double_t fConstraintYT[468]; // Array for constraint equation Y Top half - Double_t fConstraintPT[468]; // Array for constraint equation P Top half - Double_t fConstraintXB[468]; // Array for constraint equation X Bottom half - Double_t fConstraintYB[468]; // Array for constraint equation Y Bottom half - Double_t fConstraintPB[468]; // Array for constraint equation P Bottom half - Double_t fConstraintXR[468]; // Array for constraint equation X Right half - Double_t fConstraintYR[468]; // Array for constraint equation Y Right half - Double_t fConstraintPR[468]; // Array for constraint equation P Right half - Double_t fConstraintXL[468]; // Array for constraint equation X Left half - Double_t fConstraintYL[468]; // Array for constraint equation Y Left half - Double_t fConstraintPL[468]; // Array for constraint equation P Left half - Double_t fConstraintX3[468]; // Array for constraint equation St3 X - Double_t fConstraintY3[468]; // Array for constraint equation St3 Y - Double_t fConstraintX4[468]; // Array for constraint equation St4 X - Double_t fConstraintY4[468]; // Array for constraint equation St4 Y - Double_t fConstraintP4[468]; // Array for constraint equation St4 P - Double_t fConstraintX5[468]; // Array for constraint equation St5 X - Double_t fConstraintY5[468]; // Array for constraint equation St5 Y - - Int_t fDetElemId; // Detection element id - Int_t fDetElemNumber; // Detection element number - Double_t fPhi; // Azimuthal tilt of detection element - Double_t fCosPhi; // Cosine of fPhi - Double_t fSinPhi; // Sine of fPhi - Double_t fDetElemPos[3]; // Position of detection element - - AliMUONGeometryTransformer *fTransform; // Geometry transformation - - static Int_t fgNSt; // Number tracking stations - static Int_t fgNCh; // Number tracking chambers - static Int_t fgNParCh; // Number of degrees of freedom per chamber - static Int_t fgNDetElem; // Total number of detection elements - static Int_t fgNDetElemCh[10]; // Number of detection elements per chamber - static Int_t fgSNDetElemCh[10];// Sum of detection elements up to this chamber (inc) + TClonesArray *fTrackParamAtHit; ///< Array of track parameters + TClonesArray *fHitForRecAtHit; ///< Array of track hits + AliMUONTrack *fTrack; ///< AliMUONTrack + AliMUONHitForRec *fRecHit; ///< AliMUONHitForRec + AliMUONTrackParam *fTrackParam; ///< Track parameters + + Int_t fNGlobal; ///< Number of global parameters + Int_t fNLocal; ///< Number of local parameters + Int_t fNStdDev; ///< Number of standard deviations for chi2 cut + Double_t fClustPos[3]; ///< Cluster position + Double_t fClustPosLoc[3]; ///< Cluster position in local coordinates + Double_t fTrackSlope0[2]; ///< Track slope at reference point + Double_t fTrackSlope[2]; ///< Track slope at current point + Double_t fTrackPos0[3]; ///< Track intersection at reference point + Double_t fTrackPos[3]; ///< Track intersection at current point + Double_t fTrackPosLoc[3]; ///< Track intersection at current point in local coordinates + Double_t fMeas[2]; ///< Current measurement (depend on B field On/Off) + Double_t fSigma[2]; ///< Estimated resolution on measurement + + Double_t fGlobalDerivatives[468]; ///< Array of global derivatives + Double_t fLocalDerivatives[4]; ///< Array of local derivatives + + Double_t fConstraintX[468]; ///< Array for constraint equation all X + Double_t fConstraintY[468]; ///< Array for constraint equation all Y + Double_t fConstraintP[468]; ///< Array for constraint equation all P + Double_t fConstraintXT[468]; ///< Array for constraint equation X Top half + Double_t fConstraintYT[468]; ///< Array for constraint equation Y Top half + Double_t fConstraintPT[468]; ///< Array for constraint equation P Top half + Double_t fConstraintXB[468]; ///< Array for constraint equation X Bottom half + Double_t fConstraintYB[468]; ///< Array for constraint equation Y Bottom half + Double_t fConstraintPB[468]; ///< Array for constraint equation P Bottom half + Double_t fConstraintXR[468]; ///< Array for constraint equation X Right half + Double_t fConstraintYR[468]; ///< Array for constraint equation Y Right half + Double_t fConstraintPR[468]; ///< Array for constraint equation P Right half + Double_t fConstraintXL[468]; ///< Array for constraint equation X Left half + Double_t fConstraintYL[468]; ///< Array for constraint equation Y Left half + Double_t fConstraintPL[468]; ///< Array for constraint equation P Left half + Double_t fConstraintX3[468]; ///< Array for constraint equation St3 X + Double_t fConstraintY3[468]; ///< Array for constraint equation St3 Y + Double_t fConstraintX4[468]; ///< Array for constraint equation St4 X + Double_t fConstraintY4[468]; ///< Array for constraint equation St4 Y + Double_t fConstraintP4[468]; ///< Array for constraint equation St4 P + Double_t fConstraintX5[468]; ///< Array for constraint equation St5 X + Double_t fConstraintY5[468]; ///< Array for constraint equation St5 Y + + Int_t fDetElemId; ///< Detection element id + Int_t fDetElemNumber; ///< Detection element number + Double_t fPhi; ///< Azimuthal tilt of detection element + Double_t fCosPhi; ///< Cosine of fPhi + Double_t fSinPhi; ///< Sine of fPhi + Double_t fDetElemPos[3]; ///< Position of detection element + + AliMUONGeometryTransformer *fTransform; ///< Geometry transformation + + static Int_t fgNSt; ///< Number tracking stations + static Int_t fgNCh; ///< Number tracking chambers + static Int_t fgNParCh; ///< Number of degrees of freedom per chamber + static Int_t fgNDetElem; ///< Total number of detection elements + static Int_t fgNDetElemCh[10]; ///< Number of detection elements per chamber + static Int_t fgSNDetElemCh[10];///< Sum of detection elements up to this chamber (inc) ClassDef(AliMUONAlignment, 0)}; diff --git a/MUON/AliMUONChamber.h b/MUON/AliMUONChamber.h index 5472bb4fe9b..c09ffa45c89 100644 --- a/MUON/AliMUONChamber.h +++ b/MUON/AliMUONChamber.h @@ -9,6 +9,8 @@ /// \ingroup base /// \class AliMUONChamber /// \brief MUON tracking chamber class +/// +/// Now only providing DisIntegration function #include #include @@ -67,8 +69,9 @@ class AliMUONChamber : public TObject virtual void SetChargeCorrel(Float_t correl) {fResponse->SetChargeCorrel(correl);} protected: + /// Not implemented AliMUONChamber(const AliMUONChamber & rChamber); - // assignment operator + /// Not implemented AliMUONChamber& operator =(const AliMUONChamber& rhs); Int_t fId; ///< chamber number diff --git a/MUON/AliMUONChamberTrigger.cxx b/MUON/AliMUONChamberTrigger.cxx index b3e3692b12a..14130882621 100644 --- a/MUON/AliMUONChamberTrigger.cxx +++ b/MUON/AliMUONChamberTrigger.cxx @@ -31,7 +31,7 @@ /// /// Implementation of AliMUONChamber for the trigger /// -/// This class is to be deprecated. +/// \deprecated This class is to be deprecated. /// /// \cond CLASSIMP diff --git a/MUON/AliMUONChamberTrigger.h b/MUON/AliMUONChamberTrigger.h index 7182063f2e0..9e235e3e4d0 100644 --- a/MUON/AliMUONChamberTrigger.h +++ b/MUON/AliMUONChamberTrigger.h @@ -33,7 +33,9 @@ class AliMUONChamberTrigger : public AliMUONChamber Int_t& nnew, Float_t newclust[6][500]); protected: + /// Not implemented AliMUONChamberTrigger(const AliMUONChamberTrigger& right); + /// Not implemented AliMUONChamberTrigger& operator = (const AliMUONChamberTrigger& right); const AliMUONGeometryTransformer* fkGeomTransformer;///< geometry transformations diff --git a/MUON/AliMUONCheck.h b/MUON/AliMUONCheck.h index 28d0a141f10..bc339e450f3 100644 --- a/MUON/AliMUONCheck.h +++ b/MUON/AliMUONCheck.h @@ -45,7 +45,9 @@ public: void SetEventsToCheck(Int_t firstEvent, Int_t lastEvent); private: + /// Not implemented AliMUONCheck(const AliMUONCheck& rhs); + /// Not implemented AliMUONCheck& operator=(const AliMUONCheck& rhs); private: diff --git a/MUON/AliMUONCheckItem.h b/MUON/AliMUONCheckItem.h index 02683e5784c..d19f311ae10 100644 --- a/MUON/AliMUONCheckItem.h +++ b/MUON/AliMUONCheckItem.h @@ -29,6 +29,7 @@ public: AliMUONCheckItem(Int_t id, Int_t maxNumber, const char* name); virtual ~AliMUONCheckItem(); + /// Return the identifier of this item Int_t GetID() const { return fID; } TObject* GetItem(Int_t id) const; @@ -40,8 +41,11 @@ public: void Print(Option_t* opt="") const; private: + /// Not implemented AliMUONCheckItem(const AliMUONCheckItem&); + /// Not implemented AliMUONCheckItem& operator=(const AliMUONCheckItem&); + void ComputeDead() const; private: diff --git a/MUON/AliMUONClusterDrawAZ.h b/MUON/AliMUONClusterDrawAZ.h index 3c3c0b01746..e22b7d889e1 100644 --- a/MUON/AliMUONClusterDrawAZ.h +++ b/MUON/AliMUONClusterDrawAZ.h @@ -31,7 +31,7 @@ public: Int_t Next(); // commands for drawing Bool_t FindEvCh(Int_t nev, Int_t ch); // find requested event and chamber void FillMuon(Int_t nfit, const Double_t *parOk, const Double_t *errOk); // fill muon info - void ResetMuon() { fxyMu[0][6] = fxyMu[1][6] = 9999; } // reset muons + void ResetMuon() { fxyMu[0][6] = fxyMu[1][6] = 9999; } ///< reset muons void UpdateCluster(Int_t npad); // update cluster after removing non-overlapped pads private: @@ -48,8 +48,11 @@ private: // Functions + /// Not implemented AliMUONClusterDrawAZ(const AliMUONClusterDrawAZ& rhs); + /// Not implemented AliMUONClusterDrawAZ& operator=(const AliMUONClusterDrawAZ& rhs); + void Init(); // initialization void ModifyHistos(); // modify histograms void DrawHits(); // draw simulated and reconstructed hits diff --git a/MUON/AliMUONClusterFinderAZ.h b/MUON/AliMUONClusterFinderAZ.h index 019ccf7a0ae..5f210ac65b9 100644 --- a/MUON/AliMUONClusterFinderAZ.h +++ b/MUON/AliMUONClusterFinderAZ.h @@ -30,16 +30,27 @@ public: void FindRawClusters(); // the same interface as for old cluster finder void EventLoop(Int_t nev = 0, Int_t ch = 0); // first event Bool_t TestTrack(Int_t t) const; // test if track was selected + + /// Return the number of pads in the cluster on the given cathode Int_t GetNPads(Int_t cath) const { return fnPads[cath]; } + /// Return pad information \todo add more details Int_t GetIJ(Int_t indx, Int_t iPad) const { return fPadIJ[indx][iPad]; } + /// Return pad information \todo add more details Float_t GetXyq(Int_t indx, Int_t iPad) const { return fXyq[indx][iPad]; } + /// Return the z-coordinate of the hit Float_t GetZpad() const { return fZpad; } + /// Return the flag for used pads Bool_t GetUsed(Int_t cath, Int_t dig) const { return fUsed[cath][dig]; } - void SetUsed(Int_t cath, Int_t dig) { fUsed[cath][dig] = kTRUE; } // mark used digits - void SetUnused(Int_t cath, Int_t dig) { fUsed[cath][dig] = kFALSE; } // unmark digits - void SetReco(Int_t iReco) { fReco = iReco; } // set reco flag - void SetStart(Int_t iCath, Int_t iPad) { fCathBeg = iCath; fPadBeg[0] = fPadBeg[1] = 0; fPadBeg[fCathBeg] = iPad; } // start - + + /// Mark used digits + void SetUsed(Int_t cath, Int_t dig) { fUsed[cath][dig] = kTRUE; } + /// Unmark digits + void SetUnused(Int_t cath, Int_t dig) { fUsed[cath][dig] = kFALSE; } + /// Set reco flag + void SetReco(Int_t iReco) { fReco = iReco; } + /// Start \todo add more details + void SetStart(Int_t iCath, Int_t iPad) { fCathBeg = iCath; fPadBeg[0] = fPadBeg[1] = 0; fPadBeg[fCathBeg] = iPad; } + private: // Some constants static const Int_t fgkDim = 10000; ///< array size @@ -50,8 +61,8 @@ private: static AliMUONClusterFinderAZ* fgClusterFinder; ///< the ClusterFinderAZ instance Int_t fnPads[2]; //!< number of pads in the cluster on 2 cathodes - Float_t fXyq[7][fgkDim]; //!< pad information - Int_t fPadIJ[4][fgkDim]; //!< pad information + Float_t fXyq[7][fgkDim]; //!< pad information \todo add more details + Int_t fPadIJ[4][fgkDim]; //!< pad information \todo add more details AliMUONVGeometryDESegmentation *fSegmentation[2]; //!< new segmentation Float_t fZpad; //!< z-coordinate of the hit Int_t fNpar; //!< number of fit parameters @@ -69,8 +80,11 @@ private: // Functions + /// Not implemented AliMUONClusterFinderAZ(const AliMUONClusterFinderAZ& rhs); + /// Not implemented AliMUONClusterFinderAZ& operator=(const AliMUONClusterFinderAZ& rhs); + void AddPad(Int_t cath, Int_t digit); // add a pad to the cluster Bool_t Overlap(Int_t cath, AliMUONDigit *dig); // check if the pad from one cathode overlaps with a pad in the cluster on the other cathode Bool_t Overlap(Float_t *xy1, Int_t iPad, Float_t *xy12, Int_t iSkip); // check if pads xy1 and iPad overlap and return overlap area @@ -107,10 +121,13 @@ private: Double_t dyc, Double_t dxc, Double_t qtot, Double_t &yrec, Double_t &xrec, Double_t &erry, Double_t &errx); - // Dummy methods for overloading warnings + /// Dummy method for overloading warnings void FindCluster(int, int, int, AliMUONRawCluster&) {return;} + /// Dummy method for overloading warnings void FindLocalMaxima(AliMUONRawCluster*) {return;} + /// Dummy method for overloading warnings void Split(AliMUONRawCluster*) {return;} + /// Dummy method for overloading warnings void AddRawCluster(AliMUONRawCluster&) {return;} ClassDef(AliMUONClusterFinderAZ,0) // cluster finder in MUON arm of ALICE diff --git a/MUON/AliMUONClusterFinderVS.h b/MUON/AliMUONClusterFinderVS.h index 2c2f69d81ec..d8ab5c982a5 100644 --- a/MUON/AliMUONClusterFinderVS.h +++ b/MUON/AliMUONClusterFinderVS.h @@ -9,6 +9,8 @@ /// \ingroup rec /// \class AliMUONClusterFinderVS /// \brief Class for clustering and reconstruction of space points +/// +/// (Not used by default) #include @@ -26,11 +28,11 @@ class AliMUONClusterFinderVS : public TObject public: AliMUONClusterFinderVS(); virtual ~AliMUONClusterFinderVS(); -// Decluster ? +/// Decluster ? virtual void SetDeclusterFlag(Int_t flag=1) {fDeclusterFlag =flag;} -// Set max. cluster size ; bigger clusters will deconvoluted +/// Set max. cluster size ; bigger clusters will deconvoluted virtual void SetClusterSize(Int_t clsize=5) {fClusterSize = clsize;} -// Set max. number of pads per local cluster +/// Set max. number of pads per local cluster virtual void SetNperMax(Int_t npermax=5) {fNperMax = npermax;} // Search for raw clusters virtual void FindRawClusters(); @@ -50,15 +52,17 @@ class AliMUONClusterFinderVS : public TObject // Build up full cluster information virtual void FillCluster(AliMUONRawCluster *cluster, Int_t flag, Int_t cath); virtual void FillCluster(AliMUONRawCluster *cluster, Int_t cath); +/// \todo add comment virtual void FillCluster(AliMUONRawCluster *cluster) {FillCluster(cluster,1,0);} // Add a new raw cluster virtual void AddRawCluster(AliMUONRawCluster& cluster); -// Set tracks for debugging +/// Set tracks for debugging virtual void SetTracks(Int_t t1, Int_t t2) {fTrack[0]=t1; fTrack[1]=t2;} +/// Set cut in charge matching chi2 void SetGhostChi2Cut(Float_t cut) {fGhostChi2Cut = cut;} -// get raw cluster pointer +/// Get raw cluster pointer TClonesArray* GetRawClusters() {return fRawClusters;} -// reset raw clusters +/// Reset raw clusters void ResetRawClusters(); // set evt number void SetEventNumber(Int_t evtNumber) {fEvtNumber = evtNumber;} @@ -113,8 +117,9 @@ class AliMUONClusterFinderVS : public TObject Int_t fEvtNumber; ///< evt number for AZ private: + /// Not implemented AliMUONClusterFinderVS(const AliMUONClusterFinderVS& clusterFinder); -// Assignment operator + /// Not implemented assignment operator AliMUONClusterFinderVS & operator = (const AliMUONClusterFinderVS& rhs); ClassDef(AliMUONClusterFinderVS,3) //Class for clustering and reconstruction of space points diff --git a/MUON/AliMUONClusterInput.h b/MUON/AliMUONClusterInput.h index 5872d467a7a..505aeccfc0b 100644 --- a/MUON/AliMUONClusterInput.h +++ b/MUON/AliMUONClusterInput.h @@ -32,24 +32,39 @@ class AliMUONClusterInput : public TObject void SetDigits(Int_t chamber, Int_t idDE, TClonesArray* dig); void SetCluster(AliMUONRawCluster* cluster); // Access functions + /// Return the current chamber number Int_t Chamber() const {return fChamber;} + /// Return i-th digit for given cath AliMUONDigit* Digit(Int_t cath, Int_t i) const {return (AliMUONDigit*) (fDigits[cath]->UncheckedAt(i));} + /// Return the array of digits for given cathod TClonesArray* Digits(Int_t cath) const {return fDigits[cath];} + /// Return number of digits for given cathod Int_t NDigits(Int_t cath) const {return fNDigits[cath];} + /// Return geometry segmentation for given cathod AliMUONGeometrySegmentation* Segmentation2(Int_t cath) const {return fSegmentation2[cath];} + /// Return Mathieson AliMUONMathieson* Mathieson() const {return fgMathieson;} + /// Return charge correlation Float_t ChargeCorrel() const {return fChargeCorrel;} + /// Return detection elt id Int_t DetElemId() const {return fDetElemId;} // Fitting + /// Return the fitter TMinuit* Fitter() const {return fgMinuit;} // Current cluster information + /// Return the total charge for given cathod Float_t TotalCharge(Int_t cath) const {return fChargeTot[cath];} + /// Return the charge for the given cluster and cathod Float_t Charge(Int_t dig, Int_t cath) const {return fCharge[dig][cath];} + /// Return the x-position for the given cluster and cathod Int_t Ix(Int_t dig, Int_t cath) const {return fix[dig][cath];} + /// Return the y-position for the given cluster and cathod Int_t Iy(Int_t dig, Int_t cath) const {return fiy[dig][cath];} + /// Return the cluster multiplicity for given cathod Int_t Nmul(Int_t cath) const {return fNmul[cath];} + // Helpers for Fit Float_t DiscrChargeS1(Int_t i,Double_t *par); Float_t DiscrChargeCombiS1(Int_t i,Double_t *par, Int_t cath); diff --git a/MUON/AliMUONConstants.cxx b/MUON/AliMUONConstants.cxx index 7e2d3b9606a..a3c2a4516db 100644 --- a/MUON/AliMUONConstants.cxx +++ b/MUON/AliMUONConstants.cxx @@ -23,6 +23,7 @@ #include "TClass.h" /// +/// \class AliMUONConstants /// This class holds various constants to be used in many places, /// such as the number of tracking and trigger chambers, /// some geometrical constants (to build the initial geometry for simulation) diff --git a/MUON/AliMUONData.cxx b/MUON/AliMUONData.cxx index a1484627a23..25f28fcd162 100644 --- a/MUON/AliMUONData.cxx +++ b/MUON/AliMUONData.cxx @@ -15,12 +15,12 @@ /* $Id$ */ -/// AliMUONData class +/// \class AliMUONData class /// /// Class containing MUON data: hits, digits, rawclusters, globaltrigger, localtrigger, etc .. /// The classe makes the lik between the MUON data lists and the event trees from loaders /// -/// Gines Martinez, Subatech, September 2003 +/// \author Gines Martinez, Subatech, September 2003 /// #include "AliMUONData.h" diff --git a/MUON/AliMUONData.h b/MUON/AliMUONData.h index d09c45db319..8ce3a2520f8 100644 --- a/MUON/AliMUONData.h +++ b/MUON/AliMUONData.h @@ -9,12 +9,10 @@ // /// \ingroup base /// \class AliMUONData -/// \brief MUON data -/// -/// Class containing MUON data: hits, digits, rawclusters, globaltrigger, +/// \brief Class containing MUON data: hits, digits, rawclusters, globaltrigger, /// localtrigger, etc ... /// -/// Author: Gines Martinez, Subatech, September 2003 +// Author: Gines Martinez, Subatech, September 2003 #include diff --git a/MUON/AliMUONDigitizerV3.cxx b/MUON/AliMUONDigitizerV3.cxx index 8a9132471f5..5fbf692d17e 100644 --- a/MUON/AliMUONDigitizerV3.cxx +++ b/MUON/AliMUONDigitizerV3.cxx @@ -65,6 +65,7 @@ /// (for performance reason mainly, and because anyway we know we have to do it /// here, at the digitization level). /// +/// \author Laurent Aphecetche namespace { diff --git a/MUON/AliMUONEventRecoCombi.h b/MUON/AliMUONEventRecoCombi.h index 6428f896776..8ebbb6bbd1e 100644 --- a/MUON/AliMUONEventRecoCombi.h +++ b/MUON/AliMUONEventRecoCombi.h @@ -8,6 +8,7 @@ /// \ingroup rec /// \class AliMUONEventRecoCombi /// \brief Combined cluster / track finder in the MUON arm of ALICE +/// \author Alexander Zinchenko, JINR Dubna #include #include diff --git a/MUON/AliMUONGeometryEnvelope.cxx b/MUON/AliMUONGeometryEnvelope.cxx index 15d6c429708..aba4c7c292b 100644 --- a/MUON/AliMUONGeometryEnvelope.cxx +++ b/MUON/AliMUONGeometryEnvelope.cxx @@ -17,7 +17,7 @@ // // Class AliMUONGeometryEnvelope // ----------------------------- -// Helper class for definititon an assembly of volumes. +// Helper class for definititon of an assembly of volumes. // Author: Ivana Hrivnacova, IPN Orsay // 23/01/2004 diff --git a/MUON/AliMUONGeometryModuleTransformer.h b/MUON/AliMUONGeometryModuleTransformer.h index 9d99817ce03..2f03eb8a2b1 100644 --- a/MUON/AliMUONGeometryModuleTransformer.h +++ b/MUON/AliMUONGeometryModuleTransformer.h @@ -8,7 +8,7 @@ /// \class AliMUONGeometryModuleTransformer /// \brief Geometry transformer for a detector module /// -/// Class for definition of the trasformation for adetector module +/// Class for definition of the transformation for a detector module /// and its detection elements /// /// \author Ivana Hrivnacova, IPN Orsay diff --git a/MUON/AliMUONGeometrySegmentation.cxx b/MUON/AliMUONGeometrySegmentation.cxx index 4c500af1efb..16a908d3a3a 100644 --- a/MUON/AliMUONGeometrySegmentation.cxx +++ b/MUON/AliMUONGeometrySegmentation.cxx @@ -13,6 +13,8 @@ * provided "as is" without express or implied warranty. * **************************************************************************/ +/* $Id$ */ + // // Class AliMUONGeometrySegmentation // ------------------------------- @@ -22,8 +24,6 @@ // // Author:Ivana Hrivnacova, IPN Orsay -/* $Id$ */ - #include "AliMUONGeometrySegmentation.h" #include "AliMUONVGeometryDESegmentation.h" #include "AliMUONGeometryModuleTransformer.h" diff --git a/MUON/AliMUONGlobalTriggerBoard.cxx b/MUON/AliMUONGlobalTriggerBoard.cxx index 774e7d205df..9d8607f8c9c 100644 --- a/MUON/AliMUONGlobalTriggerBoard.cxx +++ b/MUON/AliMUONGlobalTriggerBoard.cxx @@ -15,11 +15,13 @@ /* $Id$ */ -//*-- Author: Rachid Guernane (LPCCFd) -// GLOBAL TRIGGER IMPLEMENTATION -// INPUTS ARE REGIONAL RESPONSES -// OUTPUT IS A 12-BIT WORD -// 4 BITS PER TRIGGER LEVEL +/// \class AliMUONGlobalTriggerBoard +/// Global trigger implementation: +/// - inputs are regional responses +/// - output is a 12-bit word +/// - 4 bits per trigger level +/// +/// \author Rachid Guernane (LPCCFd) #include "AliMUONGlobalTriggerBoard.h" #include "AliLog.h" diff --git a/MUON/AliMUONGlobalTriggerBoard.h b/MUON/AliMUONGlobalTriggerBoard.h index 12ab7814aba..efefa5d88de 100644 --- a/MUON/AliMUONGlobalTriggerBoard.h +++ b/MUON/AliMUONGlobalTriggerBoard.h @@ -7,9 +7,9 @@ /// \ingroup sim /// \class AliMUONGlobalTriggerBoard -/// \brief GLOBAL TRIGGER +/// \brief Global trigger /// -/// \author Rachid Guernane (LPCCFd) +// Author: Rachid Guernane (LPCCFd) #include "AliMUONTriggerBoard.h" diff --git a/MUON/AliMUONHitForRec.h b/MUON/AliMUONHitForRec.h index b9a39e5cb41..fcb202eca0b 100644 --- a/MUON/AliMUONHitForRec.h +++ b/MUON/AliMUONHitForRec.h @@ -9,6 +9,8 @@ /// \ingroup rec /// \class AliMUONHitForRec /// \brief Hit for reconstruction in ALICE dimuon spectrometer +/// +/// \author J. Gosset #include diff --git a/MUON/AliMUONPixel.cxx b/MUON/AliMUONPixel.cxx index 6a815e2c201..0a595fa49a0 100644 --- a/MUON/AliMUONPixel.cxx +++ b/MUON/AliMUONPixel.cxx @@ -15,12 +15,11 @@ /* $Id$ */ -// ------------------------------------- -// Class AliMUONPixel -// ------------------------------------- -// Basic object of the cluster / rec. point finder based -// on Expectation-Minimization approach (AZ cluster finder) -// Author: Alexander Zinchenko, JINR Dubna +/// \class AliMUONPixel +/// Basic object of the cluster / rec. point finder based +/// on Expectation-Minimization approach (AZ cluster finder) +/// +/// \author Alexander Zinchenko, JINR Dubna #include "AliMUONPixel.h" diff --git a/MUON/AliMUONPixel.h b/MUON/AliMUONPixel.h index 9ce458b891d..a97f15d6afa 100644 --- a/MUON/AliMUONPixel.h +++ b/MUON/AliMUONPixel.h @@ -10,7 +10,7 @@ /// \class AliMUONPixel /// \brief Pixel for MLEM method of cluster finding /// -/// \author Alexander Zinchenko, JINR Dubna +// Author Alexander Zinchenko, JINR Dubna #include diff --git a/MUON/AliMUONRawStreamTracker.cxx b/MUON/AliMUONRawStreamTracker.cxx index 80ebce97c40..98b6dfa43af 100644 --- a/MUON/AliMUONRawStreamTracker.cxx +++ b/MUON/AliMUONRawStreamTracker.cxx @@ -13,9 +13,12 @@ * provided "as is" without express or implied warranty. * **************************************************************************/ +/* $Id $ */ + /////////////////////////////////////////////////////////////////////////////// /// +/// \class AliMUONRawStreamTracker /// This class provides access to MUON digits in raw data. /// /// It loops over all MUON digits in the raw data given by the AliRawReader. @@ -26,6 +29,7 @@ /// /// First version implement for Tracker /// +/// \author Christian Finck /////////////////////////////////////////////////////////////////////////////// #include "AliMUONRawStreamTracker.h" diff --git a/MUON/AliMUONRawStreamTracker.h b/MUON/AliMUONRawStreamTracker.h index 85a808f3c21..6358cf9d2f6 100644 --- a/MUON/AliMUONRawStreamTracker.h +++ b/MUON/AliMUONRawStreamTracker.h @@ -9,13 +9,7 @@ /// \class AliMUONRawStreamTracker /// \brief Class for reading MUON raw digits /// -/// \author Christian Finck -/// -/////////////////////////////////////////////////////////////////////////////// -/// -/// This class provides access to MUON digits in raw data. -/// -/////////////////////////////////////////////////////////////////////////////// +// Author: Christian Finck #include #include "AliMUONPayloadTracker.h" diff --git a/MUON/AliMUONRawStreamTrigger.cxx b/MUON/AliMUONRawStreamTrigger.cxx index a27a98b223f..3ed48b8a542 100644 --- a/MUON/AliMUONRawStreamTrigger.cxx +++ b/MUON/AliMUONRawStreamTrigger.cxx @@ -13,9 +13,11 @@ * provided "as is" without express or implied warranty. * **************************************************************************/ +/* $Id $ */ /////////////////////////////////////////////////////////////////////////////// /// +/// \class AliMUONRawStreamTrigger /// This class provides access to MUON digits in raw data. /// /// It loops over all MUON digits in the raw data given by the AliRawReader. @@ -25,6 +27,7 @@ /// in payload class. /// /// First version implement for Trigger +/// \author Christian Finck /// /////////////////////////////////////////////////////////////////////////////// diff --git a/MUON/AliMUONRawStreamTrigger.h b/MUON/AliMUONRawStreamTrigger.h index cc54b2ca6c6..e00563f10a3 100644 --- a/MUON/AliMUONRawStreamTrigger.h +++ b/MUON/AliMUONRawStreamTrigger.h @@ -9,13 +9,7 @@ /// \class AliMUONRawStreamTrigger /// \brief Class for reading MUON raw digits /// -/// \author Christian Finck -/// -/////////////////////////////////////////////////////////////////////////////// -/// -/// This class provides access to MUON digits in raw data. -/// -/////////////////////////////////////////////////////////////////////////////// +// Author: Christian Finck #include #include "AliMUONPayloadTrigger.h" diff --git a/MUON/AliMUONRecoTrack.cxx b/MUON/AliMUONRecoTrack.cxx index f398953c27a..f5b89a26432 100644 --- a/MUON/AliMUONRecoTrack.cxx +++ b/MUON/AliMUONRecoTrack.cxx @@ -15,12 +15,11 @@ /* $Id$ */ -// ---------------------- -// Class AliMUONRecoTrack -// ---------------------- -// This class represents a reconstructed muon track -// in the tree of reconstructed events. -// Authors: Mihaela Gheata, Andrei Gheata 09/10/00 +/// \class AliMUONRecoTrack +/// This class represents a reconstructed muon track +/// in the tree of reconstructed events. +/// +/// \author Mihaela Gheata, Andrei Gheata 09/10/00 #include diff --git a/MUON/AliMUONRecoTrack.h b/MUON/AliMUONRecoTrack.h index c448081a359..29e3f8ebc0a 100644 --- a/MUON/AliMUONRecoTrack.h +++ b/MUON/AliMUONRecoTrack.h @@ -10,7 +10,7 @@ /// \class AliMUONRecoTrack /// \brief A reconstructed muon track /// -/// \author M.Gheata, A.Gheata 09/10/00 +// Author: M.Gheata, A.Gheata 09/10/00 #include #include diff --git a/MUON/AliMUONRegionalTriggerBoard.cxx b/MUON/AliMUONRegionalTriggerBoard.cxx index 2b6ae117c24..2d1f88a92d3 100644 --- a/MUON/AliMUONRegionalTriggerBoard.cxx +++ b/MUON/AliMUONRegionalTriggerBoard.cxx @@ -15,11 +15,13 @@ /* $Id$ */ -//*-- Author: Rachid Guernane (LPCCFd) -// DIMUON REGIONAL TRIGGER IMPLEMENTATION -// ENTRY ARE LOCAL BOARD RESPONSES -// OUTPUT IS 12-BIT WORD -// ALGORITHM IS SIMILAR TO THE GLOBAL ONE +/// \class AliMUONRegionalTriggerBoard +/// Dimuon regional trigger implementation: +/// - entry are local board responses +/// - output is 12-bit word +/// - algorithm is similar to the global one +/// +/// \author Rachid Guernane (LPCCFd) #include "AliMUONRegionalTriggerBoard.h" diff --git a/MUON/AliMUONRegionalTriggerBoard.h b/MUON/AliMUONRegionalTriggerBoard.h index adbfbd1b5c5..a419f83efee 100644 --- a/MUON/AliMUONRegionalTriggerBoard.h +++ b/MUON/AliMUONRegionalTriggerBoard.h @@ -7,9 +7,9 @@ /// \ingroup sim /// \class AliMUONRegionalTriggerBoard -/// \brief REGIONAL TRIGGER -/// REAL HW ALGORITHM IS IMPLEMENTED -/// \author Rachid Guernane (LPCCFd) +/// \brief Regional trigger - real HW algorithm is implemented +/// +// Author: Rachid Guernane (LPCCFd) #include "AliMUONTriggerBoard.h" diff --git a/MUON/AliMUONResponseTriggerV1.cxx b/MUON/AliMUONResponseTriggerV1.cxx index 340bd8289e7..69f6c4e74d5 100644 --- a/MUON/AliMUONResponseTriggerV1.cxx +++ b/MUON/AliMUONResponseTriggerV1.cxx @@ -253,7 +253,8 @@ void AliMUONResponseTriggerV1::Neighbours(const Int_t cath, ///-----------------NON-BENDING------------------------------------- /n /// Returns list of 10 next neighbours for given Y strip (ix, iy) /n /// neighbour number 9 8 7 6 5 (Y strip (ix, iy)) 0 1 2 3 4 in the list /n - /// \_______/ \_______/ /n + /// |_______| |_______/ /n + /// left right /n for (Int_t i=0; i<10; i++) { diff --git a/MUON/AliMUONResponseV0.h b/MUON/AliMUONResponseV0.h index 1ec6dced21c..ee587b5a350 100644 --- a/MUON/AliMUONResponseV0.h +++ b/MUON/AliMUONResponseV0.h @@ -61,18 +61,18 @@ class AliMUONResponseV0 : public AliMUONResponse virtual void SetPitch(Float_t p1) {fMathieson->SetPitch(p1);}; /// Set Mathieson parameters - /// Mathieson \sqrt{Kx3} and derived Kx2 and Kx4 + /// Mathieson sqrt{Kx3} and derived Kx2 and Kx4 /// passing pointer to class Mathieson for backward compatibility virtual void SetSqrtKx3AndDeriveKx2Kx4(Float_t SqrtKx3); - /// Mathieson \sqrt{Kx3} + /// Mathieson sqrt{Kx3} virtual void SetSqrtKx3(Float_t p1) {fMathieson->SetSqrtKx3(p1);}; /// Mathieson Kx2 virtual void SetKx2(Float_t p1) {fMathieson->SetKx2(p1);}; /// Mathieson Kx4 virtual void SetKx4(Float_t p1) {fMathieson->SetKx4(p1);}; - /// Mathieson \sqrt{Ky3} and derived Ky2 and Ky4 + /// Mathieson sqrt{Ky3} and derived Ky2 and Ky4 virtual void SetSqrtKy3AndDeriveKy2Ky4(Float_t SqrtKy3); - /// Mathieson \sqrt{Ky3} + /// Mathieson sqrt{Ky3} virtual void SetSqrtKy3(Float_t p1) {fMathieson->SetSqrtKy3(p1);}; /// Mathieson Ky2 virtual void SetKy2(Float_t p1) {fMathieson->SetKy2(p1);}; diff --git a/MUON/AliMUONVTrackReconstructor.cxx b/MUON/AliMUONVTrackReconstructor.cxx index c9525125d3f..de82ef1e9b3 100644 --- a/MUON/AliMUONVTrackReconstructor.cxx +++ b/MUON/AliMUONVTrackReconstructor.cxx @@ -15,9 +15,9 @@ /* $Id$ */ -/// \class AliMUONVTrackReconstructor //////////////////////////////////// /// +/// \class AliMUONVTrackReconstructor /// Virtual MUON track reconstructor in ALICE (class renamed from AliMUONEventReconstructor) /// /// This class contains as data: @@ -29,6 +29,8 @@ /// * EventReconstruct to build the muon tracks /// * EventReconstructTrigger to build the trigger tracks /// +/// \author Philippe Pillot +/// //////////////////////////////////// #include "AliMUONVTrackReconstructor.h" diff --git a/MUON/AliMUONVTrackReconstructor.h b/MUON/AliMUONVTrackReconstructor.h index 280894a5207..1afb87e5738 100644 --- a/MUON/AliMUONVTrackReconstructor.h +++ b/MUON/AliMUONVTrackReconstructor.h @@ -9,9 +9,7 @@ /// \class AliMUONVTrackReconstructor /// \brief Virtual class for the MUON track reconstruction /// -///////////////////////////////////////////// -/// Virtual MUON track reconstructor in ALICE -///////////////////////////////////////////// +// Author: Philippe Pillot #include diff --git a/MUON/AliMillepede.h b/MUON/AliMillepede.h index 1b5b61d8ac3..b5fbe862925 100644 --- a/MUON/AliMillepede.h +++ b/MUON/AliMillepede.h @@ -36,7 +36,9 @@ public: virtual Int_t SetGlobalConstraint(double dercs[], double rhs); virtual Int_t SetLocalEquation(double dergb[], double derlc[], double rmeas, double sigma); virtual Int_t LocalFit(int n, double localParams[], Bool_t bSingleFit); + /// Get number of local equations virtual Int_t GetNLocalEquations() const {return fNLocalEquations;}; + /// Set number of local equations virtual void SetNLocalEquations(int value) {fNLocalEquations = value;}; virtual Int_t PrintGlobalParameters() const; virtual Int_t SetIterations (double cutfac); @@ -46,15 +48,15 @@ private: // Max. dimensions - static const int fgkMaxGlobalPar = 1000; // Max. number of global parameters - static const int fgkMaxLocalPar = 20; // Max. number of local parameters - static const int fgkMaxGloCsts = 10; // Max. number of constraint equations - static const int fgkMaxGloPC = 1010; // fgkMaxGlobalPar+fgkMaxGloCsts + static const int fgkMaxGlobalPar = 1000; ///< Max. number of global parameters + static const int fgkMaxLocalPar = 20; ///< Max. number of local parameters + static const int fgkMaxGloCsts = 10; ///< Max. number of constraint equations + static const int fgkMaxGloPC = 1010; ///< fgkMaxGlobalPar+fgkMaxGloCsts // Private methods - Double_t GetParCorrelation(int i, int j); + // Double_t GetParCorrelation(int i, int j); int SpmInv(double v[][fgkMaxGloPC], double b[], int n); int SpmInv(double v[][fgkMaxLocalPar], double b[], int n); @@ -64,57 +66,57 @@ private: // Matrices - double fMatCGlo[fgkMaxGloPC][fgkMaxGloPC]; // Matrix C global - double fMatCLoc[fgkMaxLocalPar][fgkMaxLocalPar]; // Matrix C local - double fMatCGloLoc[fgkMaxGlobalPar][fgkMaxLocalPar]; // Rectangular matrix C g*l - double fMatCGloCorr[fgkMaxGlobalPar][fgkMaxGlobalPar];// Correction of matrix C global - double fMatDerConstr[fgkMaxGloCsts][fgkMaxGlobalPar]; // Constrained derivatives + double fMatCGlo[fgkMaxGloPC][fgkMaxGloPC]; ///< Matrix C global + double fMatCLoc[fgkMaxLocalPar][fgkMaxLocalPar]; ///< Matrix C local + double fMatCGloLoc[fgkMaxGlobalPar][fgkMaxLocalPar]; ///< Rectangular matrix C g*l + double fMatCGloCorr[fgkMaxGlobalPar][fgkMaxGlobalPar];///< Correction of matrix C global + double fMatDerConstr[fgkMaxGloCsts][fgkMaxGlobalPar]; ///< Constrained derivatives // Vectors and useful variables - double fDiagCGlo[fgkMaxGloPC]; // Initial diagonal elements of C global matrix - double fVecBGlo[fgkMaxGloPC]; // Vector B global (parameters) - double fVecBGloCorr[fgkMaxGlobalPar]; // Correction of vector B global - double fVecBLoc[fgkMaxLocalPar]; // Vector B local (parameters) + double fDiagCGlo[fgkMaxGloPC]; ///< Initial diagonal elements of C global matrix + double fVecBGlo[fgkMaxGloPC]; ///< Vector B global (parameters) + double fVecBGloCorr[fgkMaxGlobalPar]; ///< Correction of vector B global + double fVecBLoc[fgkMaxLocalPar]; ///< Vector B local (parameters) - double fInitPar[fgkMaxGlobalPar]; // Initial global parameters - double fDeltaPar[fgkMaxGlobalPar]; // Variation of global parameters - double fSigmaPar[fgkMaxGlobalPar]; // Sigma of allowed variation of global parameter + double fInitPar[fgkMaxGlobalPar]; ///< Initial global parameters + double fDeltaPar[fgkMaxGlobalPar]; ///< Variation of global parameters + double fSigmaPar[fgkMaxGlobalPar]; ///< Sigma of allowed variation of global parameter - double fLagMult[fgkMaxGloCsts]; // Lagrange multipliers of constrained equations + double fLagMult[fgkMaxGloCsts]; ///< Lagrange multipliers of constrained equations - Bool_t fIsNonLinear[fgkMaxGlobalPar]; // Flag for non linear parameters - int fGlo2CGLRow[fgkMaxGlobalPar]; // Global parameter to row in "used" g*l matrix - int fCGLRow2Glo[fgkMaxGlobalPar]; // Row in "used" g*l matrix to global parameter + Bool_t fIsNonLinear[fgkMaxGlobalPar]; ///< Flag for non linear parameters + int fGlo2CGLRow[fgkMaxGlobalPar]; ///< Global parameter to row in "used" g*l matrix + int fCGLRow2Glo[fgkMaxGlobalPar]; ///< Row in "used" g*l matrix to global parameter - TArrayI fIndexLocEq; // Table of parameter indexes in local equation - TArrayD fDerivLocEq; // Table of local equation derivatives wrt. parameter - TArrayI fIndexAllEqs; // Index in all loc. eq. storage for iterations - TArrayD fDerivAllEqs; // derivative in all loc. eq. storage for iterations - TArrayI fLocEqPlace; // Loc. Eq. position in AllEqs storage + TArrayI fIndexLocEq; ///< Table of parameter indexes in local equation + TArrayD fDerivLocEq; ///< Table of local equation derivatives wrt. parameter + TArrayI fIndexAllEqs; ///< Index in all loc. eq. storage for iterations + TArrayD fDerivAllEqs; ///< derivative in all loc. eq. storage for iterations + TArrayI fLocEqPlace; ///< Loc. Eq. position in AllEqs storage - Int_t fNIndexLocEq; // Number of entries in fIndexLocEq - Int_t fNDerivLocEq; // Number of entries in fDerivLocEq - Int_t fNIndexAllEqs; // Number of entries in fIndexAllEqs - Int_t fNDerivAllEqs; // Number of entries in fDerivAllEqs - Int_t fNLocEqPlace; // Number of entries in fLocEqPlace + Int_t fNIndexLocEq; ///< Number of entries in fIndexLocEq + Int_t fNDerivLocEq; ///< Number of entries in fDerivLocEq + Int_t fNIndexAllEqs; ///< Number of entries in fIndexAllEqs + Int_t fNDerivAllEqs; ///< Number of entries in fDerivAllEqs + Int_t fNLocEqPlace; ///< Number of entries in fLocEqPlace - int fNLocalEquations; // Number of local equations - double fResCutInit; // Cut in residual for first iterartion - double fResCut; // Cut in residual for other iterartiona - - double fChi2CutFactor; // Cut factor for chi2 cut to accept local fit - double fChi2CutRef; // Reference cut for chi2 cut to accept local fit - - int fIter; // Current iteration - int fMaxIter; // Maximum number of iterations - int fNStdDev; // Number of standard deviations for chi2 cut - int fNGlobalConstraints; // Number of constraint equations - int fNLocalFits; // Number of local fits - int fNLocalFitsRejected; // Number of local fits rejected - int fNGlobalPar; // Number of global parameters - int fNLocalPar; // Number of local parameters + int fNLocalEquations; ///< Number of local equations + double fResCutInit; ///< Cut in residual for first iterartion + double fResCut; ///< Cut in residual for other iterartiona + + double fChi2CutFactor; ///< Cut factor for chi2 cut to accept local fit + double fChi2CutRef; ///< Reference cut for chi2 cut to accept local fit + + int fIter; ///< Current iteration + int fMaxIter; ///< Maximum number of iterations + int fNStdDev; ///< Number of standard deviations for chi2 cut + int fNGlobalConstraints; ///< Number of constraint equations + int fNLocalFits; ///< Number of local fits + int fNLocalFitsRejected; ///< Number of local fits rejected + int fNGlobalPar; ///< Number of global parameters + int fNLocalPar; ///< Number of local parameters ClassDef(AliMillepede, 0) // Millepede Class }; -- 2.43.0