removed obsolete AliMUONAlignmentRecord classes (AliMillePedeRecord is now used,...

diff --git a/MUON/AliMUONAlignmentRecord.cxx b/MUON/AliMUONAlignmentRecord.cxx
deleted file mode 100644 (file)
index cbb63f3..0000000
--- a/MUON/AliMUONAlignmentRecord.cxx
+++ /dev/null
@@ -1,183 +0,0 @@
-/**************************************************************************
- * Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. *
- *                                                                        *
- * Author: The ALICE Off-line Project.                                    *
- * Contributors are mentioned in the code where appropriate.              *
- *                                                                        *
- * Permission to use, copy, modify and distribute this software and its   *
- * documentation strictly for non-commercial purposes is hereby granted   *
- * without fee, provided that the above copyright notice appears in all   *
- * copies and that both the copyright notice and this permission notice   *
- * appear in the supporting documentation. The authors make no claims     *
- * about the suitability of this software for any purpose. It is          *
- * provided "as is" without express or implied warranty.                  *
- **************************************************************************/
-
-/* $Id$ */
-
-//-----------------------------------------------------------------------------
-// Class AliMUONAlignmentClusterRecord
-// Class AliMUONAlignmentTrackRecord
-//-----------------------------------------------------------------------------
-
-#include "AliMUONAlignmentRecord.h"
-#include "AliLog.h"
-
-#include <iostream>
-
-// class implementation in root context
-ClassImp( AliMUONAlignmentClusterRecord )
-
-// class implementation in root context
-ClassImp( AliMUONAlignmentTrackRecord )
-
-//__________________________________________________________________________
-AliMUONAlignmentClusterRecord::AliMUONAlignmentClusterRecord( void ):
-  fDetElemId(0),
-  fDetElemNumber(0),
-  fMeas(0),
-  fSigma(0)
-{
-
-  // initialize derivatives
-  for( Int_t index = 0; index < 4; ++index )
-  {
-    fLocalDerivatives[index] = 0;
-    fGlobalDerivatives[index] = 0;
-  }
-
-}
-
-//__________________________________________________________________________
-void AliMUONAlignmentClusterRecord::Print( Option_t* ) const
-{
-
-  // detector id and measurement
-  std::cout
-    << " AliMUONAlignmentClusterRecord::Print - fDetElemId: " << fDetElemId
-    << " fMeas: " << fMeas
-    << " fSigma: " << fSigma;
-
-  // local derivatives
-  std::cout << " fLocalDerivatives: ";
-  for( Int_t index = 0; index < 4; ++index )
-  { std::cout << fLocalDerivatives[index] << " "; }
-
-  // global derivatives
-  std::cout << " fGlobalDerivatives: ";
-  for( Int_t index = 0; index < 4; ++index )
-  { std::cout << fGlobalDerivatives[index] << " "; }
-
-  std::cout << std::endl;
-
-}
-
-//__________________________________________________________________________
-AliMUONAlignmentTrackRecord::AliMUONAlignmentTrackRecord( TRootIOCtor* /*dummy*/ ):
-  fClusterRecords (0x0),
-  fClusterCount( 0 )
-  {}
-
-//__________________________________________________________________________
-AliMUONAlignmentTrackRecord::AliMUONAlignmentTrackRecord( void ):
-fClusterRecords (new TClonesArray( "AliMUONAlignmentClusterRecord", fSize ) ),
-fClusterCount( 0 )
-{}
-
-
-//__________________________________________________________________________
-AliMUONAlignmentTrackRecord::AliMUONAlignmentTrackRecord( const AliMUONAlignmentTrackRecord& other ):
-  TObject(other),
-  fClusterRecords (new TClonesArray( "AliMUONAlignmentClusterRecord", fSize ) ),
-  fClusterCount( other.fClusterCount )
-{
-
-  // deep copy of records
-  for( Int_t index = 0; index < other.GetNRecords(); ++index )
-  { new ((*fClusterRecords)[index]) AliMUONAlignmentClusterRecord( *static_cast<const AliMUONAlignmentClusterRecord*>( other.fClusterRecords->UncheckedAt( index ) ) ); }
-
-}
-
-//__________________________________________________________________________
-AliMUONAlignmentTrackRecord& AliMUONAlignmentTrackRecord::operator = ( const AliMUONAlignmentTrackRecord& other )
-{
-
-  if( this == &other ) return *this;
-  Clear();
-
-  TObject::operator =( other );
-
-  // copy number of cluster
-  fClusterCount = other.fClusterCount;
-
-  // deep copy of records
-  for( Int_t index = 0; index < other.GetNRecords(); ++index )
-  { new ((*fClusterRecords)[index]) AliMUONAlignmentClusterRecord( *static_cast<const AliMUONAlignmentClusterRecord*>( other.fClusterRecords->UncheckedAt( index ) ) ); }
-
-  return *this;
-
-}
-
-
-//__________________________________________________________________________
-void AliMUONAlignmentTrackRecord::Print( Option_t* ) const
-{
-
-  std::cout << "AliMUONAlignmentTrackRecord::Print - fClusterCount: " << fClusterCount << std::endl;
-  if( fClusterRecords )
-  {
-    for( Int_t index = 0; index < fClusterCount; ++index )
-    { static_cast<AliMUONAlignmentClusterRecord*>( fClusterRecords->UncheckedAt( index ) )->Print(); }
-  }
-
-}
-
-//__________________________________________________________________________
-AliMUONAlignmentTrackRecord::~AliMUONAlignmentTrackRecord( void )
-{
-
-  // note: it is safe to delete a NULL pointer, so no need to check.
-  delete fClusterRecords;
-
-}
-
-//__________________________________________________________________________
-void AliMUONAlignmentTrackRecord::AddClusterRecord( const AliMUONAlignmentClusterRecord& record )
-{
-
-  // append copy to array
-  new ((*fClusterRecords)[fClusterCount]) AliMUONAlignmentClusterRecord( record );
-  fClusterCount++;
-
-}
-
-//__________________________________________________________________________
-void AliMUONAlignmentTrackRecord::RemoveClusterRecord( AliMUONAlignmentClusterRecord* record )
-{
-
-  AliMUONAlignmentClusterRecord* local( static_cast<AliMUONAlignmentClusterRecord*>( fClusterRecords->Remove( record ) ) );
-
-  if( local )
-  {
-
-    delete local;
-    fClusterRecords->Compress();
-    fClusterCount--;
-
-  } else AliWarning("object to remove does not exist in array fClusterRecords");
-
-}
-
-//__________________________________________________________________________
-void AliMUONAlignmentTrackRecord::Clear( Option_t* options )
-{
-
-  TObject::Clear( options );
-
-  // only Clear, not delete, since fClusterRecords does not allocate memory
-  fClusterRecords->Clear();
-
-  // reset count
-  fClusterCount = 0;
-
-}

diff --git a/MUON/AliMUONAlignmentRecord.h b/MUON/AliMUONAlignmentRecord.h
deleted file mode 100644 (file)
index 1ed2d23..0000000
--- a/MUON/AliMUONAlignmentRecord.h
+++ /dev/null
@@ -1,204 +0,0 @@
-#ifndef ALIMUONALIGNMENTRECORD_H
-#define ALIMUONALIGNMENTRECORD_H
-/* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. *
- * See cxx source for full Copyright notice                               */
-
-/* $Id$ */
-
-/// \ingroup rec
-/// \class AliMUONAlignmentClusterRecord
-/// \brief Class to store alignment local and global derivatives of muon spectrometer
-//
-// Author: Hugo Pereira Da Costa
-
-#include <TClonesArray.h>
-#include <TObject.h>
-#include <cassert>
-
-class AliMUONAlignmentClusterRecord:public TObject
-{
-
-public:
-
-  /// constructor
-  AliMUONAlignmentClusterRecord( void );
-
-  /// destructor
-  virtual ~AliMUONAlignmentClusterRecord( void )
-  {}
-
-  /// Print
-  virtual void Print(Option_t* = "") const;
-
-  ///@name modifiers
-  ///@{
-
-  /// detetion element Id
-  void SetDetElemId( Int_t value )
-  {
-    fDetElemId = value;
-    fDetElemNumber = fDetElemId%100;
-  }
-
-  /// detection element number
-  void SetDetElemNumber( Int_t value )
-  { fDetElemNumber = value; }
-
-  /// measurement
-  void SetMeas( Double_t value )
-  { fMeas = value; }
-
-  /// error on measurement
-  void SetSigma( Double_t value )
-  { fSigma = value; }
-
-  /// local derivative
-  void SetLocalDerivative( Int_t index, Double_t value )
-  {
-    // todo: bound check ?
-    fLocalDerivatives[index] = value;
-  }
-
-  /// global derivative
-  void SetGlobalDerivative( Int_t index, Double_t value )
-  {
-    // todo: bound check ?
-    fGlobalDerivatives[index] = value;
-  }
-
-  ///@}
-
-  ///@name accessors
-  ///@{
-
-  /// detection element id
-  Int_t GetDetElemId( void ) const
-  { return fDetElemId; }
-
-  /// detection element number
-  Int_t GetDetElemNumber( void ) const
-  { return fDetElemNumber; }
-
-  /// measurement
-  Double_t GetMeas( void ) const
-  { return fMeas; }
-
-  /// error on measurement
-  Double_t GetSigma( void ) const
-  { return fSigma; }
-
-  /// local derivative
-  Double_t GetLocalDerivative( Int_t index ) const
-  {
-    // todo: bound check ?
-    return fLocalDerivatives[index];
-  }
-
-  /// global derivative
-  Double_t GetGlobalDerivative( Int_t index ) const
-  {
-    // todo: bound check ?
-    return fGlobalDerivatives[index];
-  }
-
-  /// @}
-
-private:
-
-  /// Detection element Id
-  Int_t fDetElemId;
-
-  /// Detection element number
-  Int_t fDetElemNumber;
-
-  /// measurement
-  Double_t fMeas;
-
-  /// error on measurement
-  Double_t fSigma;
-
-  /// local derivatives
-  Double_t fLocalDerivatives[4];
-
-  /// global derivatives
-  Double_t fGlobalDerivatives[4];
-
-ClassDef(AliMUONAlignmentClusterRecord, 1)
-
-};
-
-/// \ingroup rec
-/// \class AliMUONAlignmentTrackRecord
-/// \brief Class to store alignment local and global derivatives of muon spectrometer
-//
-// Author: Hugo Pereira Da Costa
-class AliMUONAlignmentTrackRecord:public TObject
-{
-
-public:
-
-       /// constructor
-  AliMUONAlignmentTrackRecord(TRootIOCtor* dummy);
-       
-  /// constructor
-  AliMUONAlignmentTrackRecord( void );
-
-  /// destructor
-  virtual ~AliMUONAlignmentTrackRecord( void );
-
-  /// copy constructor
-  AliMUONAlignmentTrackRecord (const AliMUONAlignmentTrackRecord& );
-
-  /// assignment operator
-  AliMUONAlignmentTrackRecord& operator=(const AliMUONAlignmentTrackRecord& );
-
-  /// Print
-  virtual void Print(Option_t* option = "") const;
-
-  ///@name accessors
-  //@{
-
-  /// cluster records
-  TClonesArray* GetClusterRecords( void ) const
-  { return fClusterRecords; }
-
-  /// number of records
-  Int_t GetNRecords( void ) const
-  { return fClusterCount; }
-
-  /// return record for given index
-  AliMUONAlignmentClusterRecord* GetRecord( Int_t index ) const
-  { return fClusterRecords ? static_cast<AliMUONAlignmentClusterRecord*>(fClusterRecords->UncheckedAt( index )) : 0x0; }
-
-  //@}
-
-  ///@name modifiers
-  //@{
-
-  /// add cluster record
-  void AddClusterRecord( const AliMUONAlignmentClusterRecord& );
-
-  /// remove cluster record
-  void RemoveClusterRecord( AliMUONAlignmentClusterRecord* );
-
-  /// clear memory
-  virtual void Clear( Option_t* ="" );
-
-  //@}
-
-private:
-
-  /// default clonesarray size
-  enum { fSize = 20 };
-
-  /// alignment parameters at cluster
-  TClonesArray* fClusterRecords;
-
-  /// number of cluster records in array
-  Int_t fClusterCount;
-
-ClassDef(AliMUONAlignmentTrackRecord, 1)
-
-};
-
-#endif

diff --git a/MUON/CMakelibMUONcalign.pkg b/MUON/CMakelibMUONcalign.pkg
index e223e6b79af822604e726ea8860bd9937759ca01..f453e7ee9b065503421e23c80f896650577189c8 100644 (file)
--- a/MUON/CMakelibMUONcalign.pkg
+++ b/MUON/CMakelibMUONcalign.pkg
@@ -1,4 +1,4 @@
-# -*- mode: CMake -*- 
+# -*- mode: CMake -*-
 #--------------------------------------------------------------------------------#
 # Package File for MUONcalign                                                    #
 # Author : Johny Jose (johny.jose@cern.ch)                                       #
@@ -26,15 +26,14 @@
 # SHLIBS - Shared Libraries and objects for linking (Executables only)           #
 #--------------------------------------------------------------------------------#
 
-set ( SRCS 
-    AliMUONClusterInfo.cxx 
-    AliMUONPadInfo.cxx 
-    AliMUONAlignment.cxx 
-               AliMUONAlignmentRecord.cxx
-    AliMUONAlignmentTask.cxx 
-    AliMUONReAlignTask.cxx 
-    AliMUONChamberCalibrationTask.cxx 
-    )
+set ( SRCS
+               AliMUONClusterInfo.cxx
+               AliMUONPadInfo.cxx
+               AliMUONAlignment.cxx
+               AliMUONAlignmentTask.cxx
+               AliMUONReAlignTask.cxx
+               AliMUONChamberCalibrationTask.cxx
+               )
 
 string ( REPLACE ".cxx" ".h" HDRS "${SRCS}" )
 

diff --git a/MUON/MUONcalignLinkDef.h b/MUON/MUONcalignLinkDef.h
index efaa6aa736f26068e1d3e9807882bcc3122d49d8..3dfcc0c272add01b502d5afd88c5124e05ef94ad 100644 (file)
--- a/MUON/MUONcalignLinkDef.h
+++ b/MUON/MUONcalignLinkDef.h
@@ -4,7 +4,7 @@
 // $Id$
 
 /// \file MUONcalignLinkDef.h
-/// \brief The CINT link definitions for \ref calign 
+/// \brief The CINT link definitions for \ref calign
 
 
 #ifdef __CINT__
@@ -15,8 +15,6 @@
 #pragma link C++ class AliMUONClusterInfo+;
 #pragma link C++ class AliMUONPadInfo+;
 #pragma link C++ class AliMUONAlignment+;
-#pragma link C++ class AliMUONAlignmentClusterRecord+;
-#pragma link C++ class AliMUONAlignmentTrackRecord+;
 #pragma link C++ class AliMUONAlignmentTask+;
 #pragma link C++ class AliMUONReAlignTask+;
 #pragma link C++ class AliMUONChamberCalibrationTask+;