From: decaro Date: Fri, 13 Jun 2008 18:04:33 +0000 (+0000) Subject: Increased the default window for the TOF signal visualization X-Git-Url: http://git.uio.no/git/?a=commitdiff_plain;h=82dabae7aaeed62398d13a9139c2e5e816486ac8;p=u%2Fmrichter%2FAliRoot.git Increased the default window for the TOF signal visualization --- diff --git a/EVE/EveDet/AliEveTOFDigitsInfo.cxx b/EVE/EveDet/AliEveTOFDigitsInfo.cxx index 8a91689a417..64d7b7ba659 100644 --- a/EVE/EveDet/AliEveTOFDigitsInfo.cxx +++ b/EVE/EveDet/AliEveTOFDigitsInfo.cxx @@ -64,7 +64,7 @@ void AliEveTOFDigitsInfo::SetTree(TTree* tree) */ } /* ******************************************************* */ -void AliEveTOFDigitsInfo::ReadRaw(AliRawReader* rawReader, Int_t nEvent, Bool_t newDecoder) +void AliEveTOFDigitsInfo::ReadRaw(AliRawReader* rawReader, Bool_t newDecoder) { // Read raw-data. AliTOFdigit is used to // store raw-adata for all sub-detectors. @@ -79,7 +79,7 @@ void AliEveTOFDigitsInfo::ReadRaw(AliRawReader* rawReader, Int_t nEvent, Bool_t //ftxt << endl; //ftxt << " " << nEvent << endl; - if (nEvent<0) printf("%3i\n", nEvent); // only to use nEvent variable + //if (nEvent<0) printf("%3i\n", nEvent); // only to use nEvent variable const Int_t kDDL = AliDAQ::NumberOfDdls("TOF"); @@ -109,7 +109,7 @@ void AliEveTOFDigitsInfo::ReadRaw(AliRawReader* rawReader, Int_t nEvent, Bool_t AliTOFrawData *tofRawDatum = (AliTOFrawData*)clonesRawData->UncheckedAt(iRawData); - if (tofRawDatum->GetTOT()==-1 || tofRawDatum->GetTOF()==-1) continue; + if (tofRawDatum->GetTOF()==-1) continue; Int_t cLenInt = Int_t(cableLength->GetCableTimeShift(indexDDL, tofRawDatum->GetTRM(), tofRawDatum->GetTRMchain(),tofRawDatum->GetTDC())*1000./AliTOFGeometry::TdcBinWidth()); digit[0] = tofRawDatum->GetTOF() - cLenInt; @@ -127,6 +127,7 @@ void AliEveTOFDigitsInfo::ReadRaw(AliRawReader* rawReader, Int_t nEvent, Bool_t else ftxt << " " << tofRawDatum->GetTDC(); ftxt << " " << tofRawDatum->GetTDCchannel(); */ + stream.EquipmentId2VolumeId(indexDDL, tofRawDatum->GetTRM(), tofRawDatum->GetTRMchain(), tofRawDatum->GetTDC(), tofRawDatum->GetTDCchannel(), detectorIndex); @@ -281,6 +282,7 @@ TClonesArray* AliEveTOFDigitsInfo::GetDigits(Int_t nSector, Int_t nPlate, informations[1] = digs->GetAdc(); informations[2] = digs->GetToT(); informations[3] = digs->GetTdcND(); + for(Int_t kk=0; kk<3; kk++) dummy[kk] = digs->GetTrack(kk); new (ldigits[newCounter++]) AliTOFdigit(dummy, vol, informations); } @@ -349,6 +351,7 @@ TClonesArray* AliEveTOFDigitsInfo::GetDigits(Int_t nSector) informations[1] = digs->GetAdc(); informations[2] = digs->GetToT(); informations[3] = digs->GetTdcND(); + for(Int_t kk=0; kk<3; kk++) dummy[kk] = digs->GetTrack(kk); new (ldigits[newCounter++]) AliTOFdigit(dummy, vol, informations); AliDebug(2,Form(" %2i -> %2i %2i %2i %2i %2i %7i %7i\n", diff --git a/EVE/EveDet/AliEveTOFDigitsInfo.h b/EVE/EveDet/AliEveTOFDigitsInfo.h index 8073409af67..5515cbf3245 100644 --- a/EVE/EveDet/AliEveTOFDigitsInfo.h +++ b/EVE/EveDet/AliEveTOFDigitsInfo.h @@ -31,7 +31,7 @@ class AliEveTOFDigitsInfo : public TObject, public TEveRefCnt virtual ~AliEveTOFDigitsInfo(); void SetTree(TTree* tree); - void ReadRaw(AliRawReader* rawReader, Int_t nEvent, Bool_t newDecoder=kTRUE); + void ReadRaw(AliRawReader* rawReader, Bool_t newDecoder=kTRUE); void LoadDigits(); void GetDigits(Int_t nSector, Int_t nPlate, Int_t nStrip, @@ -47,6 +47,8 @@ class AliEveTOFDigitsInfo : public TObject, public TEveRefCnt TTree* GetTree() {return fTree;}; + AliTOFDigitMap* GetTOFdigitMap() const { return fTOFdigitMap;}; + protected: AliEveTOFDigitsInfo(const AliEveTOFDigitsInfo&); // Not implemented diff --git a/EVE/EveDet/AliEveTOFSector.cxx b/EVE/EveDet/AliEveTOFSector.cxx index ad8edb14fd9..c3e1eda1e20 100644 --- a/EVE/EveDet/AliEveTOFSector.cxx +++ b/EVE/EveDet/AliEveTOFSector.cxx @@ -184,9 +184,10 @@ void AliEveTOFSector::InitStatics() //fgTOFsectorPalette = new TEveRGBAPalette(0, 2048); // TOT //fgTOFsectorPalette->SetLimits(0, 2048); - fgTOFsectorPalette = new TEveRGBAPalette(0, 8192); // TDC - //fgTOFsectorPalette->SetLimits(0, 8192); - fgTOFsectorPalette->SetOverflowAction(0); + //fgTOFsectorPalette = new TEveRGBAPalette(0, 8192); // TDC + fgTOFsectorPalette = new TEveRGBAPalette(0, 100000); // TDC + fgTOFsectorPalette->SetOverflowAction(2); + fgTOFsectorPalette->SetUnderflowAction(2); fgStaticInitDone = kTRUE; } diff --git a/EVE/EveDet/AliEveTOFStrip.cxx b/EVE/EveDet/AliEveTOFStrip.cxx index 3b2fdd5439f..b8d8151c9ca 100644 --- a/EVE/EveDet/AliEveTOFStrip.cxx +++ b/EVE/EveDet/AliEveTOFStrip.cxx @@ -110,8 +110,10 @@ void AliEveTOFStrip::InitStatics() fgTOFstripFrameBox->SetFrameColor((Color_t) 32);//31); //fgTOFstripPalette = new TEveRGBAPalette(0, 2048); // TOT - fgTOFstripPalette = new TEveRGBAPalette(0, 8192); // TDC - fgTOFstripPalette->SetOverflowAction(0); + //fgTOFstripPalette = new TEveRGBAPalette(0, 192); // TDC + fgTOFstripPalette = new TEveRGBAPalette(0, 100000); // TDC + fgTOFstripPalette->SetOverflowAction(2); + fgTOFstripPalette->SetUnderflowAction(2); fgStaticInitDone = kTRUE; }