Commit d162f5e9 authored by Rafael Peretti Pezzi's avatar Rafael Peretti Pezzi

Correcting shape name and adding missing upstream files

parent a40e5f89
/**************************************************************************
* 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. *
**************************************************************************/
#include "AliMFTGeomTGeo.h"
ClassImp(AliMFTGeomTGeo)
//______________________________________________________________________
AliMFTGeomTGeo::AliMFTGeomTGeo()
:AliITSMFTGeomTGeo()
{
// default constructor
}
//______________________________________________________________________
AliMFTGeomTGeo::AliMFTGeomTGeo(const AliMFTGeomTGeo &src)
:AliITSMFTGeomTGeo(src)
{
// copy constructor
}
//______________________________________________________________________
AliMFTGeomTGeo::~AliMFTGeomTGeo()
{
// destructor
}
#ifndef ALIITSUGEOMTGEO_H
#define ALIITSUGEOMTGEO_H
/* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. *
* See cxx source for full Copyright notice */
#include "AliMFTConstants.h"
#include "AliITSMFTGeomTGeo.h"
class AliMFTGeomTGeo : public AliITSMFTGeomTGeo {
public:
AliMFTGeomTGeo();
AliMFTGeomTGeo(const AliMFTGeomTGeo &src);
~AliMFTGeomTGeo();
virtual TGeoPNEntry* GetPNEntry(Int_t index) const { return NULL; };
virtual Bool_t GetOrigMatrix(Int_t index, TGeoHMatrix &m) const {
return kFALSE; };
virtual TGeoHMatrix* ExtractMatrixSens(Int_t index) const { return NULL; };
const Int_t GetNDisks() { return AliMFTConstants::kNDisks; }
private:
AliMFTGeomTGeo& operator=(const AliMFTGeomTGeo &geom);
ClassDef(AliMFTGeomTGeo, 1) // MFT geometry based on TGeo
};
#endif
......@@ -1750,7 +1750,7 @@ TGeoVolume* AliMFTSupport::Disc_Support_01 (){
tr_ThRE->RegisterYourself();
//Combining all relief holes of one side
TGeoCompositeShape *holes = new TGeoCompositeShape ("holes", "(holes1:tr_holes1+holes2:tr_holes2+holes3:tr_holes3+holes4:tr_holes4+holesC:rot_tr_screwC+holesD:rot_tr_screwD+holesE:rot_tr_screwE+holes5+ThRA:tr_ThRA+ThRB:tr_ThRB+ThRC:tr_ThRC+ThRD:tr_ThRD+ThRE:tr_ThRE)");
TGeoCompositeShape *holes = new TGeoCompositeShape ("d1holes", "(holes1:tr_holes1+holes2:tr_holes2+holes3:tr_holes3+holes4:tr_holes4+holesC:rot_tr_screwC+holesD:rot_tr_screwD+holesE:rot_tr_screwE+holes5+ThRA:tr_ThRA+ThRB:tr_ThRB+ThRC:tr_ThRC+ThRD:tr_ThRD+ThRE:tr_ThRE)");
//Create screw areas and holes in the backside by rotation
TGeoRotation *rotback = new TGeoRotation("rotback",0.,180.,180.);
......@@ -1878,7 +1878,7 @@ TGeoVolume* AliMFTSupport::Disc_Support_01 (){
//========================
//Composing basedisk
TGeoCompositeShape *basedisk = new TGeoCompositeShape ("basedisk", "(IntCutBox+ssboxes+ssboxes:rotback-void1-void02)-holes-holes:rotback-void1:rotback-void02:rotback");
TGeoCompositeShape *basedisk = new TGeoCompositeShape ("basedisk", "(IntCutBox+ssboxes+ssboxes:rotback-void1-void02)-d1holes-d1holes:rotback-void1:rotback-void02:rotback");
TGeoVolume *vol = new TGeoVolume("Disc_Support_01", basedisk);
//vol->Raytrace();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment