X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=PHOS%2FAliPHOSLoader.cxx;h=a5873e398d154a53306aec5efc3fcabf4a14f2a4;hb=e26f1a08b051cf3a153d518dbe2088c50e6632e8;hp=bd88259f52f6323e8ebb30ef860498dd1565af66;hpb=8d8258f61fb4d0b79d3e41f81c0ba74a6c6f4796;p=u%2Fmrichter%2FAliRoot.git diff --git a/PHOS/AliPHOSLoader.cxx b/PHOS/AliPHOSLoader.cxx index bd88259f52f..a5873e398d1 100644 --- a/PHOS/AliPHOSLoader.cxx +++ b/PHOS/AliPHOSLoader.cxx @@ -72,7 +72,6 @@ #include "AliPHOSLoader.h" #include "AliPHOS.h" #include "AliPHOSHit.h" -#include "AliPHOSCalibrationDB.h" ClassImp(AliPHOSLoader) @@ -90,7 +89,7 @@ const TString AliPHOSLoader::fgkCpvRecPointsBranchName("PHOSCpvRP");//Name for b const TString AliPHOSLoader::fgkTrackSegmentsBranchName("PHOSTS");//Name for branch with TrackSegments const TString AliPHOSLoader::fgkRecParticlesBranchName("PHOSRP");//Name for branch with Reconstructed Particles //____________________________________________________________________________ -AliPHOSLoader::AliPHOSLoader() : fBranchTitle(), fcdb(0), fDebug(0), fTmpHits(0x0) +AliPHOSLoader::AliPHOSLoader() : fBranchTitle(), fDebug(0), fTmpHits(0x0) { //def ctor fTmpHits = new TClonesArray("AliPHOSHit",1000); @@ -98,26 +97,20 @@ AliPHOSLoader::AliPHOSLoader() : fBranchTitle(), fcdb(0), fDebug(0), fTmpHits(0x //____________________________________________________________________________ AliPHOSLoader::AliPHOSLoader(const Char_t *detname,const Char_t *eventfoldername) : AliLoader(detname, eventfoldername), - fBranchTitle(), fcdb(0), fDebug(0), fTmpHits(0x0) + fBranchTitle(), fDebug(0), fTmpHits(0x0) { //ctor } //____________________________________________________________________________ AliPHOSLoader::AliPHOSLoader(const Char_t *detname,TFolder *topfolder): AliLoader(detname,topfolder), - fBranchTitle(), fcdb(0), fDebug(0), fTmpHits(0x0) + fBranchTitle(), fDebug(0), fTmpHits(0x0) { //ctor fTmpHits = new TClonesArray("AliPHOSHit",1000); } -//____________________________________________________________________________ -AliPHOSLoader::AliPHOSLoader(const AliPHOSLoader & obj): - AliLoader(obj),fBranchTitle(obj.GetBranchTitle()),fcdb(obj.CalibrationDB()), - fDebug(obj.GetDebug()),fTmpHits(obj.fTmpHits) -{ - // Copy constructor -} + //____________________________________________________________________________ AliPHOSLoader::~AliPHOSLoader() @@ -837,34 +830,6 @@ void AliPHOSLoader::CleanRecParticles() } //____________________________________________________________________________ -void AliPHOSLoader::ReadCalibrationDB(const char * database,const char * filename) -{ - // Read calibration data base from file - if(fcdb && (strcmp(database,fcdb->GetTitle())==0)) - return ; - - TFile * file = gROOT->GetFile(filename) ; - if(!file) - file = TFile::Open(filename); - if(!file){ - AliError(Form("Cannot open file %s", filename)) ; - return ; - } - if(fcdb) - fcdb->Delete() ; - fcdb = dynamic_cast(file->Get("AliPHOSCalibrationDB")) ; - if(!fcdb) - AliError(Form("No database %s in file %s", database, filename)) ; -} -//____________________________________________________________________________ - -// AliPHOSSDigitizer* AliPHOSLoader::PHOSSDigitizer() -// { -// //return PHOS SDigitizer -// return dynamic_cast(SDigitizer()) ; -// } - -//____________________________________________________________________________ void AliPHOSLoader::MakeHitsArray() { // Add Hits array to the data folder