X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=FMD%2FAliFMDPreprocessor.cxx;h=98654f22e94702eb18279ddc9030ee4311705220;hb=7377baa39e2029aef48cbaedfbe1b6003c95da7c;hp=b554265b8467ab599b15dc063975a24680d9db1e;hpb=bece5229fbee1b25fea4f0fcf0d607d7f8a6d484;p=u%2Fmrichter%2FAliRoot.git diff --git a/FMD/AliFMDPreprocessor.cxx b/FMD/AliFMDPreprocessor.cxx index b554265b846..98654f22e94 100644 --- a/FMD/AliFMDPreprocessor.cxx +++ b/FMD/AliFMDPreprocessor.cxx @@ -58,7 +58,7 @@ // Latest changes by Christian Holm Christensen // -// #include + #include #include #include "AliFMDPreprocessor.h" @@ -115,7 +115,7 @@ Bool_t AliFMDPreprocessor::GetAndCheckFileSources(TList*& list, case kDCS: sys = "DCS"; break; default: sys = "unknown"; break; } - Log(Form("Failed to get file sources for %s/%s", sys.Data(), system)); + Log(Form("Failed to get file sources for %s/%d", sys.Data(), system)); return kFALSE; } return kTRUE; @@ -142,17 +142,27 @@ UInt_t AliFMDPreprocessor::Process(TMap* /* dcsAliasMap */) Bool_t resultRange = kTRUE; Bool_t resultRate = kTRUE; Bool_t resultZero = kTRUE; - + Bool_t infoCalib = kTRUE; + Bool_t resultDead = kTRUE; // Do we need this ? // if(!dcsAliasMap) return 1; // // Invoking the cdb manager and the FMD parameters class // AliCDBManager* cdb = AliCDBManager::Instance(); - // cdb->SetDefaultStorage("local://$ALICE_ROOT"); + // cdb->SetDefaultStorage("local://$ALICE_ROOT/OCDB"); // cdb->SetRun(0); + + // Get the run type + TString runType(GetRunType()); + AliFMDParameters* pars = AliFMDParameters::Instance(); - pars->Init(this, false, AliFMDParameters::kAltroMap); - + if(runType.Contains("PEDESTAL", TString::kIgnoreCase)) + pars->Init(this, false, AliFMDParameters::kAltroMap|AliFMDParameters::kPulseGain); + else if(runType.Contains("GAIN", TString::kIgnoreCase)) + pars->Init(this, false, AliFMDParameters::kAltroMap|AliFMDParameters::kPedestal); + else + pars->Init(this, false, AliFMDParameters::kAltroMap); + // This is if the SOR contains Fee parameters, and we run a DA to // extract these parameters. The same code could work if we get // the information from DCS via the FXS @@ -160,35 +170,36 @@ UInt_t AliFMDPreprocessor::Process(TMap* /* dcsAliasMap */) AliFMDCalibSampleRate* calibRate = 0; AliFMDCalibStripRange* calibRange = 0; AliFMDCalibZeroSuppression* calibZero = 0; - // Disabled for now. -#if 0 - if (GetAndCheckFileSources(files, kDAQ,"info")) - GetInfoCalibration(files, calibRate, calibRange, calibZero); + + if (GetAndCheckFileSources(files, kDAQ,pars->GetConditionsShuttleID())) + infoCalib = GetInfoCalibration(files, calibRate, calibRange, calibZero); + resultRate = (!calibRate ? kFALSE : kTRUE); resultRange = (!calibRange ? kFALSE : kTRUE); resultZero = (!calibZero ? kFALSE : kTRUE); -#endif - - // Gt the run type - TString runType(GetRunType()); + + //Creating calibration objects AliFMDCalibPedestal* calibPed = 0; AliFMDCalibGain* calibGain = 0; + AliFMDCalibDeadMap* calibDead = 0; if (runType.Contains("PEDESTAL", TString::kIgnoreCase)) { - if (GetAndCheckFileSources(files, kDAQ, "pedestals")) { + if (GetAndCheckFileSources(files, kDAQ, pars->GetPedestalShuttleID())) { if(files->GetSize()) calibPed = GetPedestalCalibration(files); } resultPed = (calibPed ? kTRUE : kFALSE); } if (runType.Contains("GAIN", TString::kIgnoreCase)) { - if (GetAndCheckFileSources(files, kDAQ, "gains")) { + if (GetAndCheckFileSources(files, kDAQ, pars->GetGainShuttleID())) { if(files->GetSize()) calibGain = GetGainCalibration(files); } resultGain = (calibGain ? kTRUE : kFALSE); } + if(runType.Contains("PEDESTAL", TString::kIgnoreCase) || runType.Contains("GAIN", TString::kIgnoreCase)) + calibDead = GetDeadChannelMap(calibPed,calibGain); //Storing Calibration objects AliCDBMetaData metaData; @@ -216,13 +227,14 @@ UInt_t AliFMDPreprocessor::Process(TMap* /* dcsAliasMap */) resultZero = Store("Calib","ZeroSuppression", calibZero,&metaData,0,kTRUE); delete calibZero; } + if(calibDead) { + resultDead = Store("Calib","Dead", calibDead,&metaData,0,kTRUE); + delete calibDead; + } -#if 0 - // Disabled until we implement GetInfoCalibration properly Bool_t success = (resultPed && resultGain && resultRange && - resultRate && resultZero); -#endif - Bool_t success = resultPed && resultGain; + resultRate && resultZero && resultDead && infoCalib); + Log(Form("FMD preprocessor was %s", (success ? "successful" : "failed"))); return (success ? 0 : 1); } @@ -242,24 +254,26 @@ AliFMDPreprocessor::GetInfoCalibration(TList* files, // z On return, newly allocated object // Return: // kTRUE on success - if (!files) return kTRUE; // Should really be false - if (files->GetEntries() <= 0) return kTRUE; + if (!files) return kFALSE; // Should really be false + if (files->GetEntries() <= 0) return kFALSE; s = new AliFMDCalibSampleRate(); r = new AliFMDCalibStripRange(); z = new AliFMDCalibZeroSuppression(); - // AliFMDParameters* pars = AliFMDParameters::Instance(); + AliFMDParameters* pars = AliFMDParameters::Instance(); TIter iter(files); TObjString* fileSource; while((fileSource = dynamic_cast(iter.Next()))) { - const Char_t* filename = GetFile(kDAQ, "info", fileSource->GetName()); + const Char_t* filename = GetFile(kDAQ, pars->GetConditionsShuttleID(), fileSource->GetName()); std::ifstream in(filename); if(!in) { Log(Form("File %s not found!", filename)); continue; } + s->ReadFromFile(in); + r->ReadFromFile(in); } return kTRUE; } @@ -267,7 +281,7 @@ AliFMDPreprocessor::GetInfoCalibration(TList* files, //____________________________________________________________________ AliFMDCalibPedestal* -AliFMDPreprocessor::GetPedestalCalibration(TList* pedFiles) +AliFMDPreprocessor::GetPedestalCalibration(const TList* pedFiles) { // Read DAQ DA produced CSV files of pedestals, and return a // calibration object. @@ -284,63 +298,62 @@ AliFMDPreprocessor::GetPedestalCalibration(TList* pedFiles) TObjString* fileSource; while((fileSource = dynamic_cast(iter.Next()))) { - const Char_t* filename = GetFile(kDAQ, "pedestals", fileSource->GetName()); + const Char_t* filename = GetFile(kDAQ, pars->GetPedestalShuttleID(), + fileSource->GetName()); std::ifstream in(filename); if(!in) { Log(Form("File %s not found!", filename)); continue; } - - // Get header (how long is it ?) - TString header; - header.ReadLine(in); - header.ToLower(); - if(!header.Contains("pedestal")) { - Log("File header is not from pedestal!"); - continue; - } - Log("File contains data from pedestals"); - - // Read columns line - int lineno = 2; - header.ReadLine(in); - // Loop until EOF - while(in.peek()!=EOF) { + int lineno = 0; + char cc; + while((cc = in.peek())!=EOF) { if(in.bad()) { Log(Form("Bad read at line %d in %s", lineno, filename)); break; } - UInt_t ddl=2, board, chip, channel, strip, sample, tb; + if (cc == '#') { + TString line; + line.ReadLine(in); + lineno++; + if (lineno == 1) { + line.ToLower(); + if(!line.Contains(pars->GetPedestalShuttleID())) { + Log(Form("File header is not from pedestal!: %s", line.Data())); + break; + } + Log("File contains data from pedestals"); + } + continue; + } + UShort_t det, sec, strip; + Char_t ring; Float_t ped, noise, mu, sigma, chi2ndf; - Char_t c[11]; + Char_t c[8]; - in >> ddl >> c[0] - >> board >> c[1] - >> chip >> c[2] - >> channel >> c[3] - >> strip >> c[4] - >> sample >> c[5] - >> tb >> c[6] - >> ped >> c[7] - >> noise >> c[8] - >> mu >> c[9] - >> sigma >> c[10] + in >> det >> c[0] + >> ring >> c[1] + >> sec >> c[2] + >> strip >> c[3] + >> ped >> c[4] + >> noise >> c[5] + >> mu >> c[6] + >> sigma >> c[7] >> chi2ndf; lineno++; // Ignore trailing garbage - if (strip > 127) continue; + // if (strip > 127) continue; //Setting DDL to comply with the FMD in DAQ - UInt_t FmdDDLBase = 3072; - ddl = ddl - FmdDDLBase; + // UInt_t FmdDDLBase = 3072; + // ddl = ddl - FmdDDLBase; //Setting the pedestals via the hardware address - UShort_t det, sec, str; - Char_t ring; - pars->Hardware2Detector(ddl,board,chip,channel,det,ring,sec,str); - strip += str; + + // pars->Hardware2Detector(ddl,board,chip,channel,det,ring,sec,str); + // strip += str; calibPed->Set(det,ring,sec,strip,ped,noise); @@ -351,7 +364,7 @@ AliFMDPreprocessor::GetPedestalCalibration(TList* pedFiles) //____________________________________________________________________ AliFMDCalibGain* -AliFMDPreprocessor::GetGainCalibration(TList* gainFiles) +AliFMDPreprocessor::GetGainCalibration(const TList* gainFiles) { // Read DAQ DA produced CSV files of pedestals, and return a // calibration object. @@ -367,64 +380,109 @@ AliFMDPreprocessor::GetGainCalibration(TList* gainFiles) TIter iter(gainFiles); TObjString* fileSource; while((fileSource = dynamic_cast(iter.Next()))) { - const Char_t* filename = GetFile(kDAQ, "gains", fileSource->GetName()); + const Char_t* filename = GetFile(kDAQ, pars->GetGainShuttleID(), + fileSource->GetName()); std::ifstream in(filename); if(!in) { Log(Form("File %s not found!", filename)); continue; } - - //Get header (how long is it ?) - TString header; - header.ReadLine(in); - header.ToLower(); - if(!header.Contains("gain")) { - Log("File header is not from gain!"); - continue; - } - Log("File contains data from pulse gain"); - - // Read column headers - header.ReadLine(in); - - int lineno = 2; - // Read until EOF - while(in.peek()!=EOF) { - if(in.bad()) { - Log(Form("Bad read at line %d in %s", lineno, filename)); - break; + // Loop until EOF + int lineno = 0; + char cc; + while((cc = in.peek())!=EOF) { + if(in.bad()) { + Log(Form("Bad read at line %d in %s", lineno, filename)); + break; } - UInt_t ddl=2, board, chip, channel, strip; + if (cc == '#') { + TString line; + line.ReadLine(in); + lineno++; + if (lineno == 1) { + line.ToLower(); + if(!line.Contains(pars->GetGainShuttleID())) { + Log(Form("File header is not from gains!: %s", line.Data())); + break; + } + Log("File contains data from gains"); + } + continue; + } + UShort_t det, sec, strip; + Char_t ring; + Float_t gain,error, chi2ndf; - Char_t c[7]; - - in >> ddl >> c[0] - >> board >> c[1] - >> chip >> c[2] - >> channel >> c[3] - >> strip >> c[4] - >> gain >> c[5] - >> error >> c[6] + Char_t c[6]; + + in >> det >> c[0] + >> ring >> c[1] + >> sec >> c[2] + >> strip >> c[3] + >> gain >> c[4] + >> error >> c[5] >> chi2ndf; lineno++; // Ignore trailing garbage - if(strip > 127) continue; + //if(strip > 127) continue; //Setting DDL to comply with the FMD in DAQ - UInt_t FmdDDLBase = 3072; - ddl = ddl - FmdDDLBase; + // UInt_t FmdDDLBase = 3072; + // ddl = ddl - FmdDDLBase; //Setting the pedestals via the hardware address - UShort_t det, sec, str; - Char_t ring; - pars->Hardware2Detector(ddl,board,chip,channel,det,ring,sec,str); + // pars->Hardware2Detector(ddl,board,chip,channel,det,ring,sec,str); - strip += str; + // strip += str; calibGain->Set(det,ring,sec,strip,gain); } } return calibGain; } +//____________________________________________________________________ +AliFMDCalibDeadMap* +AliFMDPreprocessor::GetDeadChannelMap(AliFMDCalibPedestal* pedcalib, + AliFMDCalibGain* gaincalib) { + //creating dead channel map. '0' means 51200 entries + AliFMDCalibDeadMap* deadmap = new AliFMDCalibDeadMap(0); + //deadmap->Reset(kTRUE); + Float_t noise = 0; + Float_t gain = 0; + + AliFMDParameters* pars = AliFMDParameters::Instance(); + //Looping over the channels. + for(UShort_t det=1;det<=3;det++) { + Int_t nRings = (det==1 ? 1 : 2); + for (UShort_t ir = 0; ir < nRings; ir++) { + Char_t ring = (ir == 0 ? 'I' : 'O'); + UShort_t nsec = (ir == 0 ? 20 : 40); + UShort_t nstr = (ir == 0 ? 512 : 256); + + for(UShort_t sec =0; sec < nsec; sec++) { + + for(UShort_t strip = 0; strip < nstr; strip++) { + + Bool_t isDead = kFALSE; + if(pedcalib) + noise = pedcalib->Width(det, ring, sec, strip); + else + noise = pars->GetPedestalWidth(det, ring, sec, strip); + + if(gaincalib) + gain = gaincalib->Value(det, ring, sec, strip); + else + gain = pars->GetPulseGain(det, ring, sec, strip); + + //marking these channels dead. + if (gain < 0.5 || gain > 5 || noise > 10 || noise == 0) isDead = kTRUE; + + deadmap->operator()(det, ring, sec, strip) = isDead; + } + } + } + } + return deadmap; +} //____________________________________________________________________ // // EOF