From ee9d8eca318b3fb973ab5386a4b0a35baf7cbd1d Mon Sep 17 00:00:00 2001 From: decaro Date: Fri, 25 Jan 2008 10:01:05 +0000 Subject: [PATCH] TOF Raw data and clusters visualization --- EVE/EveDet/AliEveTOFDigitsInfo.cxx | 175 ++++++++++++++++++++++++--- EVE/EveDet/AliEveTOFDigitsInfo.h | 18 ++- EVE/EveDet/AliEveTOFSector.cxx | 86 +++++++------ EVE/EveDet/AliEveTOFSector.h | 30 ++--- EVE/EveDet/AliEveTOFSectorEditor.cxx | 20 ++- EVE/EveDet/AliEveTOFStrip.cxx | 2 +- EVE/EveDet/AliEveTOFStrip.h | 6 +- EVE/EveDet/AliEveTOFStripEditor.cxx | 2 +- EVE/EveDet/AliEveTOFStripEditor.h | 3 + 9 files changed, 260 insertions(+), 82 deletions(-) diff --git a/EVE/EveDet/AliEveTOFDigitsInfo.cxx b/EVE/EveDet/AliEveTOFDigitsInfo.cxx index e71f0cbfa3c..de82a3d8219 100644 --- a/EVE/EveDet/AliEveTOFDigitsInfo.cxx +++ b/EVE/EveDet/AliEveTOFDigitsInfo.cxx @@ -13,17 +13,19 @@ #include #include "AliEveTOFDigitsInfo.h" + +#include + #include #include -//#include - -using namespace std; +#include +#include //_________________________________________________________ ClassImp(AliEveTOFDigitsInfo) - AliEveTOFDigitsInfo::AliEveTOFDigitsInfo(): + AliEveTOFDigitsInfo::AliEveTOFDigitsInfo(): TObject(), TEveRefCnt(), fTree (0), @@ -33,7 +35,7 @@ ClassImp(AliEveTOFDigitsInfo) {} /* ******************************************************* */ -AliEveTOFDigitsInfo:: ~AliEveTOFDigitsInfo() +AliEveTOFDigitsInfo:: ~AliEveTOFDigitsInfo() { delete fGeom; @@ -47,7 +49,7 @@ AliEveTOFDigitsInfo:: ~AliEveTOFDigitsInfo() void AliEveTOFDigitsInfo::SetTree(TTree* tree) { static const TEveException eH("AliEveTOFDigitsInfo::SetTree "); - + if(fGeom == 0) { fGeom = new AliTOFGeometry(); } @@ -59,7 +61,117 @@ void AliEveTOFDigitsInfo::SetTree(TTree* tree) */ } /* ******************************************************* */ +void AliEveTOFDigitsInfo::ReadRaw(AliRawReader* rawReader, Int_t nEvent) +{ + // Read raw-data. AliTOFdigit is used to + // store raw-adata for all sub-detectors. + + //ofstream ftxt; + //Char_t fileName[100]; + //sprintf(fileName,"TOFrawDataReadingFromEVE%d.txt",nEvent); + + //ftxt.open(fileName,ios::app); + //ftxt << endl; + //ftxt << " " << nEvent << endl; + + const Int_t kDDL = AliDAQ::NumberOfDdls("TOF"); + + TClonesArray *tofDigits = new TClonesArray("AliTOFdigit",10000); + fTree = new TTree(); + Int_t bufsize = 32000; + TBranch *branch = fTree->Branch("TOF", &tofDigits, bufsize); + fTree->GetEntry(0); + + TClonesArray * clonesRawData = 0x0; + + Int_t detectorIndex[5]; + Int_t digit[4]; + + AliTOFRawStream stream(rawReader); + + for (Int_t indexDDL = 0; indexDDL < kDDL; indexDDL++) { + + rawReader->Reset(); + stream.LoadRawData(indexDDL); + + clonesRawData = (TClonesArray*)stream.GetRawData(); + + for (Int_t iRawData = 0; iRawDataGetEntriesFast(); iRawData++) { + + AliTOFrawData *tofRawDatum = (AliTOFrawData*)clonesRawData->UncheckedAt(iRawData); + + if (tofRawDatum->GetTOT()==-1 || tofRawDatum->GetTOF()==-1) continue; + + digit[0] = tofRawDatum->GetTOF(); + digit[1] = tofRawDatum->GetTOT(); + digit[2] = tofRawDatum->GetTOT(); + digit[3] = -1; + /* + if (indexDDL<10) ftxt << " " << indexDDL; + else ftxt << " " << indexDDL; + if (tofRawDatum->GetTRM()<10) ftxt << " " << tofRawDatum->GetTRM(); + else ftxt << " " << tofRawDatum->GetTRM(); + ftxt << " " << tofRawDatum->GetTRMchain(); + if (tofRawDatum->GetTDC()<10) ftxt << " " << tofRawDatum->GetTDC(); + else ftxt << " " << tofRawDatum->GetTDC(); + ftxt << " " << tofRawDatum->GetTDCchannel(); + */ + stream.EquipmentId2VolumeId(indexDDL, tofRawDatum->GetTRM(), tofRawDatum->GetTRMchain(), + tofRawDatum->GetTDC(), tofRawDatum->GetTDCchannel(), detectorIndex); + //dummy = detectorIndex[3]; + //detectorIndex[3] = detectorIndex[4]; + //detectorIndex[4] = dummy; + /* + if (detectorIndex[0]<10) ftxt << " -> " << detectorIndex[0]; + else ftxt << " -> " << detectorIndex[0]; + ftxt << " " << detectorIndex[1]; + if (detectorIndex[2]<10) ftxt << " " << detectorIndex[2]; + else ftxt << " " << detectorIndex[2]; + ftxt << " " << detectorIndex[3]; + if (detectorIndex[4]<10) ftxt << " " << detectorIndex[4]; + else ftxt << " " << detectorIndex[4]; + + if (tofRawDatum->GetTOT()<10) ftxt << " " << tofRawDatum->GetTOT(); + else if (tofRawDatum->GetTOT()>=10 && tofRawDatum->GetTOT()<100) ftxt << " " << tofRawDatum->GetTOT(); + else if (tofRawDatum->GetTOT()>=100 && tofRawDatum->GetTOT()<1000) ftxt << " " << tofRawDatum->GetTOT(); + else if (tofRawDatum->GetTOT()>=1000 && tofRawDatum->GetTOT()<10000) ftxt << " " << tofRawDatum->GetTOT(); + else if (tofRawDatum->GetTOT()>=10000 && tofRawDatum->GetTOT()<100000) ftxt << " " << tofRawDatum->GetTOT(); + else if (tofRawDatum->GetTOT()>=100000 && tofRawDatum->GetTOT()<1000000) ftxt << " " << tofRawDatum->GetTOT(); + else ftxt << " " << tofRawDatum->GetTOT(); + if (tofRawDatum->GetTOF()<10) ftxt << " " << tofRawDatum->GetTOF() << endl; + else if (tofRawDatum->GetTOF()>=10 && tofRawDatum->GetTOF()<100) ftxt << " " << tofRawDatum->GetTOF() << endl; + else if (tofRawDatum->GetTOF()>=100 && tofRawDatum->GetTOF()<1000) ftxt << " " << tofRawDatum->GetTOF() << endl; + else if (tofRawDatum->GetTOF()>=1000 && tofRawDatum->GetTOF()<10000) ftxt << " " << tofRawDatum->GetTOF() << endl; + else if (tofRawDatum->GetTOF()>=10000 && tofRawDatum->GetTOF()<100000) ftxt << " " << tofRawDatum->GetTOF() << endl; + else if (tofRawDatum->GetTOF()>=100000 && tofRawDatum->GetTOF()<1000000) ftxt << " " << tofRawDatum->GetTOF() << endl; + else ftxt << " " << tofRawDatum->GetTOF() << endl; + */ + + TClonesArray &aDigits = *tofDigits; + Int_t last = tofDigits->GetEntriesFast(); + + fTOFdigitMap->AddDigit(detectorIndex, last); + + AliDebug(2,Form(" %3i -> %2i %2i %2i %2i %2i %i %i\n", + last, detectorIndex[0], detectorIndex[1], detectorIndex[2], detectorIndex[4], detectorIndex[3], + digit[1], digit[0])); + + Int_t tracknum[3]={-1,-1,-1}; + new (aDigits[last]) AliTOFdigit(tracknum, detectorIndex, digit); + + } // while loop + + clonesRawData->Clear(); + + } // DDL Loop + + fTree->Fill(); + + //ftxt.close(); +} + +/* ******************************************************* */ void AliEveTOFDigitsInfo::LoadDigits() { @@ -80,8 +192,8 @@ void AliEveTOFDigitsInfo::LoadDigits() vol[0] = digs->GetSector(); // Sector Number (0-17) vol[1] = digs->GetPlate(); // Plate Number (0-4) vol[2] = digs->GetStrip(); // Strip Number (0-14/18) - vol[3] = digs->GetPadx(); // TEvePad Number in x direction (0-47) - vol[4] = digs->GetPadz(); // TEvePad Number in z direction (0-1) + vol[3] = digs->GetPadx(); // Pad Number in x direction (0-47) + vol[4] = digs->GetPadz(); // Pad Number in z direction (0-1) fTOFdigitMap->AddDigit(vol, digitNumber); //if (digitNumber==digitsTOF->GetEntries()-1) printf(" I am inside LoadDigits %3i \n", digitNumber); @@ -137,7 +249,7 @@ TClonesArray* AliEveTOFDigitsInfo::GetDigits(Int_t nSector, Int_t nPlate, for (Int_t ii=0; ii<3; ii++) { if (nDigitsInVolume[ii]>=0 ) { - //printf(" nDigitsInVolume[%2i] = %3i\n ", ii, nDigitsInVolume[ii]); + //AliDebug(2,Form(" nDigitsInVolume[%2i] = %3i\n ", ii, nDigitsInVolume[ii])); digs = (AliTOFdigit*)digitsTOF->UncheckedAt(nDigitsInVolume[ii]); informations[0] = digs->GetTdc(); informations[1] = digs->GetAdc(); @@ -157,8 +269,8 @@ TClonesArray* AliEveTOFDigitsInfo::GetDigits(Int_t nSector, Int_t nPlate, /* if (digitsTOFnew) - printf("Sector %2i Plate %1i Strip %2i -> number of digits %3i \n", - nSector, nPlate, nStrip, digitsTOFnew->GetEntries()); + AliDebug(2,Form("Sector %2i Plate %1i Strip %2i -> number of digits %3i \n", + nSector, nPlate, nStrip, digitsTOFnew->GetEntries())); */ return digitsTOFnew; @@ -186,7 +298,7 @@ TClonesArray* AliEveTOFDigitsInfo::GetDigits(Int_t nSector) //Int_t nSector = 1; Int_t vol[5] = {nSector,-1,-1,-1,-1}; - + for(Int_t iPlate=0; iPlateNPlates(); iPlate++){ vol[1] = iPlate; if(iPlate==2) nStrips=15; @@ -208,13 +320,18 @@ TClonesArray* AliEveTOFDigitsInfo::GetDigits(Int_t nSector) for (Int_t ii=0; ii<3; ii++) { if (nDigitsInVolume[ii]>=0 ) { - //printf(" nDigitsInVolume[%2i] = %3i\n ", ii, nDigitsInVolume[ii]); + digs = (AliTOFdigit*)digitsTOF->UncheckedAt(nDigitsInVolume[ii]); informations[0] = digs->GetTdc(); informations[1] = digs->GetAdc(); informations[2] = digs->GetToT(); informations[3] = digs->GetTdcND(); new (ldigits[newCounter++]) AliTOFdigit(dummy, vol, informations); + + AliDebug(2,Form(" %2i -> %2i %2i %2i %2i %2i %7i %7i\n", + nDigitsInVolume[ii], vol[0], vol[1], vol[2], vol[4], vol[3], + informations[1], informations[0])); + } } @@ -230,14 +347,42 @@ TClonesArray* AliEveTOFDigitsInfo::GetDigits(Int_t nSector) /* if (digitsTOFnew) - printf("Sector %2i Plate %1i Strip %2i -> number of digits %3i \n", - nSector, nPlate, nStrip, digitsTOFnew->GetEntries()); + AliDebug(Form(("Sector %2i Plate %1i Strip %2i -> number of digits %3i \n", + nSector, nPlate, nStrip, digitsTOFnew->GetEntries())); */ return digitsTOFnew; } /* ******************************************************* */ +Int_t AliEveTOFDigitsInfo::GetTOFInfos() const +{ + + return fTOFdigitMap->GetFilledCellNumber(); + +} + +/* ******************************************************* */ +Int_t AliEveTOFDigitsInfo::IsStripFilled(Int_t iSector, Int_t iPlate, Int_t iStrip) +{ + + Int_t vol[5] = {iSector, iPlate, iStrip, -1, -1}; + + Int_t index = 0; + + for (Int_t iPadZ=0; iPadZNpadZ(); iPadZ++) + for (Int_t iPadX=0; iPadXNpadX(); iPadX++) + { + vol[3] = iPadX; + vol[4] = iPadZ; + if (fTOFdigitMap->GetDigitIndex(vol,0)>=0) index++; + } + + return index; + +} + +/* ******************************************************* */ void AliEveTOFDigitsInfo::GetDigits() { diff --git a/EVE/EveDet/AliEveTOFDigitsInfo.h b/EVE/EveDet/AliEveTOFDigitsInfo.h index 71689822653..c4482ae0a8c 100644 --- a/EVE/EveDet/AliEveTOFDigitsInfo.h +++ b/EVE/EveDet/AliEveTOFDigitsInfo.h @@ -11,22 +11,22 @@ #include -//#include - #include #include #include +#include + #include #include #include - + class AliEveTOFDigitsInfo : public TObject, public TEveRefCnt { AliEveTOFDigitsInfo(const AliEveTOFDigitsInfo&); // Not implemented AliEveTOFDigitsInfo& operator=(const AliEveTOFDigitsInfo&); // Not implemented - + private: protected: @@ -41,18 +41,24 @@ class AliEveTOFDigitsInfo : public TObject, public TEveRefCnt AliEveTOFDigitsInfo(); virtual ~AliEveTOFDigitsInfo(); - + void SetTree(TTree* tree); + void ReadRaw(AliRawReader* rawReader, Int_t nEvent); void LoadDigits(); - //TClonesArray* GetDigits(Int_t nSector, void GetDigits(Int_t nSector, Int_t nPlate, Int_t nStrip, Int_t nPadZ, Int_t nPadX, Int_t indexDigit[3]); TClonesArray* GetDigits(Int_t nSector, Int_t nPlate, Int_t nStrip); TClonesArray* GetDigits(Int_t nSector); + + Int_t IsStripFilled(Int_t iSector, Int_t iPlate, Int_t iStrip); + Int_t GetTOFInfos() const; void GetDigits(); + TTree* GetTree() {return fTree;}; + + ClassDef(AliEveTOFDigitsInfo, 1); }; // endclass AliEveTOFDigitsInfo diff --git a/EVE/EveDet/AliEveTOFSector.cxx b/EVE/EveDet/AliEveTOFSector.cxx index 8862ddcd066..70836c911b9 100644 --- a/EVE/EveDet/AliEveTOFSector.cxx +++ b/EVE/EveDet/AliEveTOFSector.cxx @@ -32,40 +32,45 @@ AliEveTOFSector::AliEveTOFSector(const Text_t* n, const Text_t* t) : fSector(-1), fDx(0), fDy(0), fDz(0), fAutoTrans (kTRUE), - fMinTime (0), fMaxTime (0), - fThreshold (5), fMaxVal (80), + //fMinTime (0), fMaxTime (0), + fThreshold (5), fMaxVal (80), fSectorID (0), - fPlateFlag (0), fPlateFlag0(kFALSE), fPlateFlag1(kFALSE), fPlateFlag2(kFALSE), fPlateFlag3(kTRUE), fPlateFlag4(kFALSE), - fFrameColor(4), - fRnrFrame (kFALSE), + //fPlateFlag0(kTRUE), fPlateFlag1(kTRUE), fPlateFlag2(kTRUE), fPlateFlag3(kTRUE), fPlateFlag4(kTRUE), + fPlateFlag (0x0), + //fFrameColor(4), + //fRnrFrame (kFALSE), fGeoManager(0) { fPlateFlag = new Bool_t[5]; for (Int_t ii=0; ii<5; ii++) fPlateFlag[ii]=kTRUE; - fGeoManager = (TGeoManager*)gEve->GetGeometry("$REVESYS/alice-data/alice_fullgeo.root"); + + //fGeoManager = (TGeoManager*)gEve->GetGeometry("$REVESYS/alice-data/alice_fullgeo.root"); if (!fGeoManager) { printf("ERROR: no TGeo\n"); } -} +} /* ************************************************************************ */ -AliEveTOFSector::AliEveTOFSector(TGeoManager *localGeoManager, Int_t nSector) : - TEveQuadSet(Form("Sector%i", nSector)), +AliEveTOFSector::AliEveTOFSector(TGeoManager *localGeoManager, + Int_t nSector) + : + TEveQuadSet(Form("Sector%i",nSector)), fTOFgeometry(new AliTOFGeometry()), fTOFarray(0x0), fTOFtree(0x0), fSector(nSector), fDx(0), fDy(0), fDz(0), fAutoTrans (kTRUE), - fMinTime (0), fMaxTime (0), + //fMinTime (0), fMaxTime (0), fThreshold (5), fMaxVal (80), fSectorID (nSector), - fPlateFlag (0), fPlateFlag0(kFALSE), fPlateFlag1(kFALSE), fPlateFlag2(kFALSE), fPlateFlag3(kTRUE), fPlateFlag4(kFALSE), - fFrameColor(4), - fRnrFrame (kFALSE), + //fPlateFlag0(kTRUE), fPlateFlag1(kTRUE), fPlateFlag2(kTRUE), fPlateFlag3(kTRUE), fPlateFlag4(kTRUE), + fPlateFlag (0x0), + //fFrameColor(4), + //fRnrFrame (kFALSE), fGeoManager(localGeoManager) { @@ -79,8 +84,8 @@ AliEveTOFSector::AliEveTOFSector(TGeoManager *localGeoManager, Int_t nSector) : */ InitModule(); -} +} /* ************************************************************************ */ AliEveTOFSector::AliEveTOFSector(TGeoManager *localGeoManager, @@ -94,12 +99,13 @@ AliEveTOFSector::AliEveTOFSector(TGeoManager *localGeoManager, fSector(nSector), fDx(0), fDy(0), fDz(0), fAutoTrans (kTRUE), - fMinTime (0), fMaxTime (0), - fThreshold (5), fMaxVal (80), + //fMinTime (0), fMaxTime (0), + fThreshold (5), fMaxVal (80), fSectorID (nSector), - fPlateFlag (0), fPlateFlag0(kFALSE), fPlateFlag1(kFALSE), fPlateFlag2(kFALSE), fPlateFlag3(kTRUE), fPlateFlag4(kFALSE), - fFrameColor(4), - fRnrFrame (kFALSE), + //fPlateFlag0(kTRUE), fPlateFlag1(kTRUE), fPlateFlag2(kTRUE), fPlateFlag3(kTRUE), fPlateFlag4(kTRUE), + fPlateFlag (0x0), + //fFrameColor(4), + //fRnrFrame (kFALSE), fGeoManager(localGeoManager) { @@ -109,24 +115,26 @@ AliEveTOFSector::AliEveTOFSector(TGeoManager *localGeoManager, InitModule(); } - /* ************************************************************************ */ -AliEveTOFSector::AliEveTOFSector(TGeoManager* localGeoManager, - Int_t nSector, TTree *tofTree) : - TEveQuadSet(Form("Sector%i", nSector)), +AliEveTOFSector::AliEveTOFSector(TGeoManager *localGeoManager, + Int_t nSector, + TTree *tofTree) + : + TEveQuadSet(Form("Sector%i",nSector)), fTOFgeometry(new AliTOFGeometry()), fTOFarray(0x0), fTOFtree(tofTree), fSector(nSector), fDx(0), fDy(0), fDz(0), fAutoTrans (kTRUE), - fMinTime (0), fMaxTime (0), - fThreshold (5), fMaxVal (80), + //fMinTime (0), fMaxTime (0), + fThreshold (5), fMaxVal (80), fSectorID (nSector), - fPlateFlag (0), fPlateFlag0(kFALSE), fPlateFlag1(kFALSE), fPlateFlag2(kFALSE), fPlateFlag3(kTRUE), fPlateFlag4(kFALSE), - fFrameColor(4), - fRnrFrame (kFALSE), + //fPlateFlag0(kTRUE), fPlateFlag1(kTRUE), fPlateFlag2(kTRUE), fPlateFlag3(kTRUE), fPlateFlag4(kTRUE), + fPlateFlag (0x0), + //fFrameColor(4), + //fRnrFrame (kFALSE), fGeoManager(localGeoManager) { @@ -175,8 +183,9 @@ void AliEveTOFSector::InitStatics() fgTOFsectorFrameBox->SetFrameColor((Color_t) 32);//31); //fgTOFsectorPalette = new TEveRGBAPalette(0, 2048); // TOT - fgTOFsectorPalette = new TEveRGBAPalette(0, 8192/*1024*/); // TDC - fgTOFsectorPalette->SetLimits(0, 8192); + //fgTOFsectorPalette->SetLimits(0, 2048); + fgTOFsectorPalette = new TEveRGBAPalette(0, 8192); // TDC + //fgTOFsectorPalette->SetLimits(0, 8192); fgStaticInitDone = kTRUE; } @@ -206,8 +215,6 @@ void AliEveTOFSector::InitModule() void AliEveTOFSector::LoadQuads() { - Reset(kQT_FreeQuad, kFALSE, 32); - //Int_t n_col = gStyle->GetNumberOfColors(); Int_t vol[5] = {fSectorID, -1, -1, -1, -1}; @@ -219,6 +226,8 @@ void AliEveTOFSector::LoadQuads() Double_t **coord = new Double_t*[4]; for (Int_t ii=0; ii<4; ii++) coord[ii] = new Double_t[3]; + Reset(kQT_FreeQuad, kFALSE, 32); + //printf(" fTOFarray->GetEntries() = %4i \n",fTOFarray->GetEntries()); if (fTOFtree && !fTOFarray) { @@ -243,8 +252,8 @@ void AliEveTOFSector::LoadQuads() vol[1] = digs->GetPlate(); // Plate Number (0-4) vol[2] = digs->GetStrip(); // Strip Number (0-14/18) - vol[3] = digs->GetPadx(); // TEvePad Number in x direction (0-47) - vol[4] = digs->GetPadz(); // TEvePad Number in z direction (0-1) + vol[3] = digs->GetPadx(); // Pad Number in x direction (0-47) + vol[4] = digs->GetPadz(); // Pad Number in z direction (0-1) informations[0] = digs->GetTdc(); informations[1] = digs->GetAdc(); @@ -296,6 +305,7 @@ void AliEveTOFSector::LoadQuads() // In principle could have color based on number of neigbours. We // can insert the time-of-flight value for each pad + //QuadValue((Int_t)tot); QuadValue((Int_t)tdc); QuadId(tofDigit); @@ -377,17 +387,19 @@ void AliEveTOFSector::SetMaxVal(Int_t mv) void AliEveTOFSector::DigitSelected(Int_t idx) { - // Override control-click from TEveQuadSet. + // Override control-click from TEveQuadSet DigitBase_t* qb = GetDigit(idx); TObject* obj = qb->fId.GetObject(); AliTOFdigit* digs = dynamic_cast(obj); // printf("AliEveTOFSector::QuadSelected "); Print(); + /* printf(" idx = %5i, value = %5d, obj = 0x%lx, digit = 0x%lx ", idx, qb->fValue, (ULong_t)obj, (ULong_t)digs); + */ if (digs) - printf("-> Sector = %2i Plate = %1i Strip = %2i ToT = %3i Tof = %5i\n", - fSector , digs->GetPlate(), digs->GetStrip(), digs->GetToT(), digs->GetTdc()); + printf("\n Sector = %2i Plate = %1i Strip = %2i PadZ = %1i PadX = %2i ToT = %3i Tof = %5i\n", + fSector , digs->GetPlate(), digs->GetStrip(), digs->GetPadz(), digs->GetPadx(), digs->GetToT(), digs->GetTdc()); else printf("\n"); } diff --git a/EVE/EveDet/AliEveTOFSector.h b/EVE/EveDet/AliEveTOFSector.h index 883edab3af3..aa931f31e4f 100644 --- a/EVE/EveDet/AliEveTOFSector.h +++ b/EVE/EveDet/AliEveTOFSector.h @@ -21,13 +21,13 @@ #include - + class AliEveTOFSector : public TEveQuadSet - + { AliEveTOFSector(const AliEveTOFSector&); // Not implemented AliEveTOFSector& operator=(const AliEveTOFSector&); // Not implemented - + //Int_t fSectorID; private: @@ -49,22 +49,22 @@ Float_t fDz; /////////////////////////////// - Bool_t fAutoTrans; - Int_t fMinTime; - Int_t fMaxTime; + Bool_t fAutoTrans; + //Int_t fMinTime; + //Int_t fMaxTime; Short_t fThreshold; Int_t fMaxVal; Int_t fSectorID; Bool_t *fPlateFlag; - Bool_t fPlateFlag0; - Bool_t fPlateFlag1; - Bool_t fPlateFlag2; - Bool_t fPlateFlag3; - Bool_t fPlateFlag4; + //Bool_t fPlateFlag0; + //Bool_t fPlateFlag1; + //Bool_t fPlateFlag2; + //Bool_t fPlateFlag3; + //Bool_t fPlateFlag4; - Color_t fFrameColor; - Bool_t fRnrFrame; + //Color_t fFrameColor; + //Bool_t fRnrFrame; TGeoManager *fGeoManager; @@ -72,10 +72,10 @@ // Bool_t fAutoTrans; virtual void InitModule(); - virtual void SetTrans(); + virtual void SetTrans(); AliEveTOFSector(const Text_t* n="AliEveTOFSector", const Text_t* t=0); AliEveTOFSector(TGeoManager *localGeoManager, Int_t nSector); - + AliEveTOFSector(TGeoManager *localGeoManager, Int_t nSector, TClonesArray *tofArray); AliEveTOFSector(TGeoManager *localGeoManager, diff --git a/EVE/EveDet/AliEveTOFSectorEditor.cxx b/EVE/EveDet/AliEveTOFSectorEditor.cxx index ca5d87a120d..dc335689bbf 100644 --- a/EVE/EveDet/AliEveTOFSectorEditor.cxx +++ b/EVE/EveDet/AliEveTOFSectorEditor.cxx @@ -31,10 +31,11 @@ ClassImp(AliEveTOFSectorEditor) AliEveTOFSectorEditor::AliEveTOFSectorEditor(const TGWindow *p, Int_t width, Int_t height, UInt_t options, Pixel_t back) : TGedFrame(p, width, height, options | kVerticalFrame, back), - fM(0), - fSectorID(0), fAutoTrans(0), - fPlate(0), fPlate0(0), fPlate1(0), fPlate2(0), fPlate3(0), fPlate4(0), - fThreshold(0), fMaxVal(0) + fM(0) , + fSectorID (0), fAutoTrans (0), + fPlate (0), + fPlate0(0), fPlate1(0), fPlate2(0), fPlate3(0), fPlate4(0), + fThreshold (0), fMaxVal(0) { fPlate = new TGCheckButton*[5]; @@ -125,6 +126,8 @@ AliEveTOFSectorEditor::AliEveTOFSectorEditor(const TGWindow *p, Int_t width, Int } +/******************************************************************************/ + AliEveTOFSectorEditor::~AliEveTOFSectorEditor() { delete [] fPlate; @@ -210,3 +213,12 @@ void AliEveTOFSectorEditor::DoMaxVal() fMaxVal->SetValue(fM->GetMaxVal()); Update(); } + +/* +void AliEveTOFSectorEditor::DoTime() +{ + fM->SetMinTime((Int_t) fTime->GetMin()); + fM->SetMaxTime((Int_t) fTime->GetMax()); + Update(); +} +*/ diff --git a/EVE/EveDet/AliEveTOFStrip.cxx b/EVE/EveDet/AliEveTOFStrip.cxx index ac53ca32bea..e60df79d533 100644 --- a/EVE/EveDet/AliEveTOFStrip.cxx +++ b/EVE/EveDet/AliEveTOFStrip.cxx @@ -34,7 +34,7 @@ AliEveTOFStrip::AliEveTOFStrip(const Text_t* n, const Text_t* t) : fGeoManager(0) { - fGeoManager = (TGeoManager*)gEve->GetGeometry("$REVESYS/alice-data/alice_fullgeo.root"); + //fGeoManager = (TGeoManager*)gEve->GetGeometry("$REVESYS/alice-data/alice_fullgeo.root"); if (!fGeoManager) printf("ERROR: no TGeo\n"); } diff --git a/EVE/EveDet/AliEveTOFStrip.h b/EVE/EveDet/AliEveTOFStrip.h index 0e3c62155db..2f9a4f7b572 100644 --- a/EVE/EveDet/AliEveTOFStrip.h +++ b/EVE/EveDet/AliEveTOFStrip.h @@ -49,11 +49,11 @@ protected: public: AliEveTOFStrip(const Text_t* n="AliEveTOFStrip", const Text_t* t=0); AliEveTOFStrip(TGeoManager *localGeoManager, - Int_t nSector, Int_t nPlate, Int_t nStrip); + Int_t nSector, Int_t nPlate, Int_t nStrip); AliEveTOFStrip(TGeoManager *localGeoManager, - Int_t nSector, Int_t nPlate, Int_t nStrip, - TClonesArray *tofArray); + Int_t nSector, Int_t nPlate, Int_t nStrip, + TClonesArray *tofArray); virtual ~AliEveTOFStrip(); static Bool_t fgStaticInitDone; diff --git a/EVE/EveDet/AliEveTOFStripEditor.cxx b/EVE/EveDet/AliEveTOFStripEditor.cxx index 27c76f63c75..60585b63b8d 100644 --- a/EVE/EveDet/AliEveTOFStripEditor.cxx +++ b/EVE/EveDet/AliEveTOFStripEditor.cxx @@ -7,6 +7,7 @@ * full copyright notice. * **************************************************************************/ + #include "AliEveTOFStripEditor.h" #include @@ -19,7 +20,6 @@ #include #include - //______________________________________________________________________________ // AliEveTOFStripEditor // diff --git a/EVE/EveDet/AliEveTOFStripEditor.h b/EVE/EveDet/AliEveTOFStripEditor.h index 123f8ed6317..418d58723b4 100644 --- a/EVE/EveDet/AliEveTOFStripEditor.h +++ b/EVE/EveDet/AliEveTOFStripEditor.h @@ -7,6 +7,7 @@ * full copyright notice. * **************************************************************************/ + #ifndef ALIEVE_TOFStripEditor_H #define ALIEVE_TOFStripEditor_H @@ -16,6 +17,7 @@ class TGCheckButton; class TGNumberEntry; class TGColorSelect; + class AliEveTOFStrip; @@ -43,4 +45,5 @@ public: ClassDef(AliEveTOFStripEditor, 0); // Editor for AliEveTOFStrip }; // endclass AliEveTOFStripEditor + #endif -- 2.43.0