From 28dd10b6a94d7e6ecf81bf8b16aca168e335322c Mon Sep 17 00:00:00 2001 From: arcelli Date: Fri, 31 Mar 2006 11:27:02 +0000 Subject: [PATCH] changing CDB Ids according to standard convention --- TOF/AliTOFAlignment.cxx | 37 +++++++++++++++++++++++++++++++++---- TOF/AliTOFAlignment.h | 3 +++ TOF/AliTOFClusterFinder.cxx | 2 +- TOF/AliTOFDigitizer.cxx | 2 +- TOF/AliTOFcalib.cxx | 21 ++++++++++++--------- 5 files changed, 50 insertions(+), 15 deletions(-) diff --git a/TOF/AliTOFAlignment.cxx b/TOF/AliTOFAlignment.cxx index c5ab16cc910..7c9dd65ae6d 100644 --- a/TOF/AliTOFAlignment.cxx +++ b/TOF/AliTOFAlignment.cxx @@ -12,6 +12,9 @@ * about the suitability of this software for any purpose. It is * * provided "as is" without express or implied warranty. * $Log$ +Revision 1.1 2006/03/28 14:54:48 arcelli +class for TOF alignment + author: Silvia Arcelli, arcelli@bo.infn.it */ @@ -67,8 +70,10 @@ void AliTOFAlignment::Smear( Float_t *tr, Float_t *rot){ Int_t nSM71 = 13, nSM74=2, nSM75=3; - AliAlignObj::ELayerID iLayer = AliAlignObj::kTOF; - Int_t iIndex=1; //dummy volume index + AliAlignObj::ELayerID iLayer = AliAlignObj::kInvalidLayer; + UShort_t iIndex=0; //dummy volume index + // AliAlignObj::ELayerID iLayer = AliAlignObj::kTOF; + // Int_t iIndex=1; //dummy volume index UShort_t dvoluid = AliAlignObj::LayerToVolUID(iLayer,iIndex); //dummy volume identity Int_t i; for (i = 1; i<=nSM71 ; i++) { @@ -139,8 +144,10 @@ void AliTOFAlignment::Align( Float_t *tr, Float_t *rot){ Int_t nSM71 = 13, nSM74=2, nSM75=3; - AliAlignObj::ELayerID iLayer = AliAlignObj::kTOF; - Int_t iIndex=1; //dummy volume index + AliAlignObj::ELayerID iLayer = AliAlignObj::kInvalidLayer; + UShort_t iIndex=0; //dummy volume index + // AliAlignObj::ELayerID iLayer = AliAlignObj::kTOF; + // Int_t iIndex=1; //dummy volume index UShort_t dvoluid = AliAlignObj::LayerToVolUID(iLayer,iIndex); //dummy volume identity Int_t i; for (i = 1; i<=nSM71 ; i++) { @@ -192,6 +199,7 @@ void AliTOFAlignment::Align( Float_t *tr, Float_t *rot){ } fNTOFAlignObj=fTOFAlignObjArray->GetEntries(); AliInfo(Form("Number of Alignable Volumes: %d",fNTOFAlignObj)); + AliInfo("Sono nel cesso"); } //_____________________________________________________________________________ void AliTOFAlignment::WriteParOnCDB(Char_t *sel, Int_t minrun, Int_t maxrun){ @@ -245,3 +253,24 @@ void AliTOFAlignment::ReadSimParFromCDB(Char_t *sel, Int_t nrun){ AliInfo(Form("Number of Alignable Volumes from CDB: %d",fNTOFAlignObj)); } +//_____________________________________________________________________________ +void AliTOFAlignment::WriteOnCDBforDC(){ + AliCDBManager *man = AliCDBManager::Instance(); + if(!man->IsDefaultStorageSet())man->SetDefaultStorage("local://$ALICE_ROOT"); + AliCDBId idTOFAlign("TOF/Align/Data",0,0); + AliCDBMetaData *mdTOFAlign = new AliCDBMetaData(); + mdTOFAlign->SetComment("Alignment objects for ideal geometry, i.e. applying them to TGeo has to leave geometry unchanged"); + mdTOFAlign->SetResponsible("TOF"); + AliInfo(Form("Number of Alignable Volumes: %d",fNTOFAlignObj)); + man->Put(fTOFAlignObjArray,idTOFAlign,mdTOFAlign); +} +//_____________________________________________________________________________ +void AliTOFAlignment::ReadFromCDBforDC(){ + AliCDBManager *man = AliCDBManager::Instance(); + if(!man->IsDefaultStorageSet())man->SetDefaultStorage("local://$ALICE_ROOT"); + AliCDBEntry *entry = man->Get("TOF/Align/Data",0); + fTOFAlignObjArray=(TObjArray*)entry->GetObject(); + fNTOFAlignObj=fTOFAlignObjArray->GetEntries(); + AliInfo(Form("Number of Alignable Volumes from CDB: %d",fNTOFAlignObj)); + +} diff --git a/TOF/AliTOFAlignment.h b/TOF/AliTOFAlignment.h index 7c8486848b7..a4e8fb5bf50 100644 --- a/TOF/AliTOFAlignment.h +++ b/TOF/AliTOFAlignment.h @@ -26,6 +26,9 @@ public: virtual void ReadSimParFromCDB(Char_t *sel, Int_t nrun); virtual void Smear(Float_t *tr=0, Float_t *rot=0); // create a set of AlignObj for TOF virtual void Align(Float_t *tr=0, Float_t *rot=0); // create a set of AlignObj for TOF + virtual void WriteOnCDBforDC(); + virtual void ReadFromCDBforDC(); + TObjArray * GetTOFAlignArray() const {return fTOFAlignObjArray;} private: diff --git a/TOF/AliTOFClusterFinder.cxx b/TOF/AliTOFClusterFinder.cxx index 1498a489140..c842b632cde 100644 --- a/TOF/AliTOFClusterFinder.cxx +++ b/TOF/AliTOFClusterFinder.cxx @@ -547,7 +547,7 @@ void AliTOFClusterFinder::CalibrateRecPoint() Float_t TdcCorr; AliInfo(" Calibrating TOF Clusters: ") AliTOFcalib *calib = new AliTOFcalib(fTOFGeometry); - calib->ReadParFromCDB("TOF/CDB",1); + calib->ReadParFromCDB("TOF/Calib",0); AliTOFCal *TOFCalArray = calib->GetTOFCalArray(); for (ii=0; iiReadSimParFromCDB("TOF/CDB", 1); + calib->ReadSimParFromCDB("TOF/Calib", 0); } //--------------------------------------------------------------------- void AliTOFDigitizer::DecalibrateTOFSignal( AliTOFcalib *calib){ diff --git a/TOF/AliTOFcalib.cxx b/TOF/AliTOFcalib.cxx index d5fa8ec3740..de65d9503b6 100644 --- a/TOF/AliTOFcalib.cxx +++ b/TOF/AliTOFcalib.cxx @@ -15,6 +15,9 @@ /* $Log$ +Revision 1.3 2006/03/28 14:57:02 arcelli +updates to handle new V5 geometry & some re-arrangements + Revision 1.2 2006/02/13 17:22:26 arcelli just Fixing Log info @@ -619,7 +622,7 @@ void AliTOFcalib::CorrectESDTime(AliESD *event){ void AliTOFcalib::WriteParOnCDB(Char_t *sel, Int_t minrun, Int_t maxrun){ AliCDBManager *man = AliCDBManager::Instance(); if(!man->IsDefaultStorageSet())man->SetDefaultStorage("local://$ALICE_ROOT"); - Char_t *sel1 = "CalibPar" ; + Char_t *sel1 = "Par" ; Char_t out[100]; sprintf(out,"%s/%s",sel,sel1); AliCDBId id(out,minrun,maxrun); @@ -632,7 +635,7 @@ void AliTOFcalib::WriteParOnCDB(Char_t *sel, Int_t minrun, Int_t maxrun){ void AliTOFcalib::WriteParOnCDB(Char_t *sel, Int_t minrun, Int_t maxrun, AliTOFCal *cal){ AliCDBManager *man = AliCDBManager::Instance(); if(!man->IsDefaultStorageSet())man->SetDefaultStorage("local://$ALICE_ROOT"); - Char_t *sel1 = "CalibPar" ; + Char_t *sel1 = "Par" ; Char_t out[100]; sprintf(out,"%s/%s",sel,sel1); AliCDBId id(out,minrun,maxrun); @@ -645,7 +648,7 @@ void AliTOFcalib::WriteParOnCDB(Char_t *sel, Int_t minrun, Int_t maxrun, AliTOFC void AliTOFcalib::ReadParFromCDB(Char_t *sel, Int_t nrun){ AliCDBManager *man = AliCDBManager::Instance(); if(!man->IsDefaultStorageSet())man->SetDefaultStorage("local://$ALICE_ROOT"); - Char_t *sel1 = "CalibPar" ; + Char_t *sel1 = "Par" ; Char_t out[100]; sprintf(out,"%s/%s",sel,sel1); AliCDBEntry *entry = man->Get(out,nrun); @@ -686,12 +689,12 @@ void AliTOFcalib::WriteSimParOnCDB(Char_t *sel, Int_t minrun, Int_t maxrun){ if(!man->IsDefaultStorageSet())man->SetDefaultStorage("local://$ALICE_ROOT"); AliCDBMetaData *md = new AliCDBMetaData(); md->SetResponsible("Chiara Zampolli"); - Char_t *sel1 = "CalibSimPar" ; + Char_t *sel1 = "SimPar" ; Char_t out[100]; sprintf(out,"%s/%s",sel,sel1); AliCDBId id1(out,minrun,maxrun); man->Put(fTOFSimCal,id1,md); - Char_t *sel2 = "CalibSimHisto" ; + Char_t *sel2 = "SimHisto" ; sprintf(out,"%s/%s",sel,sel2); AliCDBId id2(out,minrun,maxrun); man->Put(fTOFSimToT,id2,md); @@ -707,12 +710,12 @@ void AliTOFcalib::WriteSimParOnCDB(Char_t *sel, Int_t minrun, Int_t maxrun, AliT if(!man->IsDefaultStorageSet())man->SetDefaultStorage("local://$ALICE_ROOT"); AliCDBMetaData *md = new AliCDBMetaData(); md->SetResponsible("Chiara Zampolli"); - Char_t *sel1 = "CalibSimPar" ; + Char_t *sel1 = "SimPar" ; Char_t out[100]; sprintf(out,"%s/%s",sel,sel1); AliCDBId id1(out,minrun,maxrun); man->Put(fTOFSimCal,id1,md); - Char_t *sel2 = "CalibSimHisto" ; + Char_t *sel2 = "SimHisto" ; sprintf(out,"%s/%s",sel,sel2); AliCDBId id2(out,minrun,maxrun); man->Put(fTOFSimToT,id2,md); @@ -723,13 +726,13 @@ void AliTOFcalib::ReadSimParFromCDB(Char_t *sel, Int_t nrun){ if(!man->IsDefaultStorageSet())man->SetDefaultStorage("local://$ALICE_ROOT"); AliCDBMetaData *md = new AliCDBMetaData(); md->SetResponsible("Chiara Zampolli"); - Char_t *sel1 = "CalibSimPar" ; + Char_t *sel1 = "SimPar" ; Char_t out[100]; sprintf(out,"%s/%s",sel,sel1); AliCDBEntry *entry1 = man->Get(out,nrun); AliTOFCal *cal =(AliTOFCal*)entry1->GetObject(); fTOFSimCal=cal; - Char_t *sel2 = "CalibSimHisto" ; + Char_t *sel2 = "SimHisto" ; sprintf(out,"%s/%s",sel,sel2); AliCDBEntry *entry2 = man->Get(out,nrun); TH1F *histo =(TH1F*)entry2->GetObject(); -- 2.39.3