/* History of cvs commits:
*
* $Log$
+ * Revision 1.6 2007/08/28 13:12:18 hristov
+ * AliAlignObjAngles becomes AliAlignObjParams (Raffaele)
+ *
+ * Revision 1.5 2007/07/10 12:41:38 kharlov
+ * Added a new class AliPHOSSurvet1 which read survey data from EDMS files
+ *
* Revision 1.4 2007/05/17 17:34:54 kharlov
* Merging differences if v1.2 and 1.3
*
*/
// Objects of this class read txt file with survey (photogrammetry) data
-// and convert the data into AliAlignObjAngles of alignable PHOS volumes.
+// and convert the data into AliAlignObjParams of alignable PHOS volumes.
// It can be used as a base class, you need to override GetStripTransformation.
// AliPHOSSurvey inherits TObject only to use AliLog "functions".
// Author: Timur Pocheptsov (JINR)
#include "AliSurveyObj.h"
#include "AliPHOSEMCAGeometry.h"
-#include "AliAlignObjAngles.h"
+#include "AliAlignObjParams.h"
#include "AliPHOSGeometry.h"
#include "AliPHOSSurvey.h"
#include "AliLog.h"
}
//____________________________________________________________________________
-void AliPHOSSurvey::CreateAliAlignObjAngles(TClonesArray &array)
+void AliPHOSSurvey::CreateAliAlignObjParams(TClonesArray &array)
{
- //Create AliAlignObjAngles.
+ //Create AliAlignObjParams.
const AliPHOSGeometry * phosGeom = AliPHOSGeometry::GetInstance("IHEP", "IHEP");
if (!phosGeom) {
AliError("Cannot obtain AliPHOSGeometry instance.");
TString stripName(TString::Format("PHOS/Module%d/Strip_%d_%d", module, i, j));
AliPHOSStripDelta t(GetStripTransformation(stripNum++, module));
new(array[arrayInd])
- AliAlignObjAngles(
+ AliAlignObjParams(
stripName.Data(), volid,
t.fXShift, t.fYShift, t.fZShift,
-t.fPsi, -t.fTheta, -t.fPhi,
for (Int_t i = 0; i < emcaGeom->GetNStripX(); ++i)
for (Int_t j = 0; j < emcaGeom->GetNStripZ(); ++j) {
TString stripName(TString::Format("PHOS/Module%d/Strip_%d_%d", module, i, j));
- new(array[arrayInd]) AliAlignObjAngles(stripName.Data(), volid, 0., 0., 0., 0., 0., 0., true);
+ new(array[arrayInd]) AliAlignObjParams(stripName.Data(), volid, 0., 0., 0., 0., 0., 0., true);
++arrayInd;
}
}
const AliPHOSGeometry *phosGeom = AliPHOSGeometry::GetInstance("IHEP", "IHEP");
AliPHOSEMCAGeometry * emcaGeom = phosGeom->GetEMCAGeometry();
const Float_t *strip = emcaGeom->GetStripHalfSize();
- const Float_t *cell = emcaGeom->GetSteelCellHalfSize();
+ const Float_t *cell = emcaGeom->GetAirCellHalfSize();
AliPHOSStripCoords *idealStrips = new AliPHOSStripCoords[fStrNum];//1
for (Int_t ix = 0, stripNumber = 0; ix < emcaGeom->GetNStripX(); ++ix) {