From 162637e45086576ffcf0568d28fa43359819765a Mon Sep 17 00:00:00 2001 From: hristov Date: Mon, 9 Feb 2009 15:47:08 +0000 Subject: [PATCH] Extacting the OCDB in a separate module. The detectors have write permission in the corresponding subdirectory OCDB/DET. --- ACORDE/AliACORDEDigitizer.cxx | 2 +- ACORDE/MakeACORDEFullMisAlignment.C | 2 +- ACORDE/MakeACORDEResMisAlignment.C | 2 +- ACORDE/MakeACORDEZeroMisAlignment.C | 2 +- ACORDE/macros/DBStorageCalib.C | 2 +- EMCAL/AliEMCALRecParam.cxx | 2 +- EMCAL/MakeEMCALFullMisAlignment.C | 2 +- EMCAL/MakeEMCALResMisAlignment.C | 2 +- EMCAL/beamtest07/Rec.C | 4 ++-- EMCAL/beamtest07/SetCalibDB.C | 2 +- .../macros/AlignmentDB/AliEMCALSetAlignment.C | 6 ++--- .../CalibrationDB/AliEMCALDecalibrate.C | 2 +- EMCAL/macros/CalibrationDB/get_pedestalAll.C | 2 +- EMCAL/macros/QaDB/makeEMCALQARef.C | 4 ++-- EVE/EveBase/AliEveEventManager.cxx | 4 ++-- EVE/EveDet/AliEveTRDModuleImp.cxx | 2 +- EVE/alice-macros/trd_loader.C | 2 +- EVE/alice-macros/trd_qaRec.C | 2 +- EVE/hlt-macros/geom_hlt.C | 2 +- EVE/hlt-macros/homer_display.C | 2 +- EVE/macros/display.C | 4 ++-- FMD/AliFMDBackgroundCorrection.cxx | 4 ++-- FMD/AliFMDCalibFaker.cxx | 2 +- FMD/AliFMDPreprocessor.cxx | 2 +- FMD/MakeFMDFullMisAlignment.C | 2 +- FMD/MakeFMDResMisAlignment.C | 2 +- FMD/MakeFMDZeroMisAlignment.C | 2 +- FMD/Reconstruct.C | 2 +- FMD/analysis/RunAliEnFMDAnalysis.C | 2 +- FMD/analysis/RunAliEnFMDAnalysisSE.C | 2 +- FMD/analysis/RunLocalFMDAnalysis.C | 2 +- FMD/analysis/RunLocalFMDAnalysisSE.C | 2 +- FMD/scripts/Convert2Raw.C | 2 +- FMD/scripts/Digits2Raw.C | 2 +- FMD/scripts/DisplayDigits.C | 2 +- FMD/scripts/DisplayESD.C | 2 +- FMD/scripts/DisplayHits.C | 2 +- FMD/scripts/DisplayRecs.C | 2 +- FMD/scripts/ESDDataSize.C | 2 +- FMD/scripts/FancyDigits.C | 2 +- FMD/scripts/FancyHits.C | 2 +- FMD/scripts/FullMapping.C | 2 +- FMD/scripts/Hits2Digits.C | 2 +- FMD/scripts/Hits2SDigits.C | 2 +- FMD/scripts/MakeAlignment.C | 2 +- FMD/scripts/MakeCalibration.C | 2 +- FMD/scripts/MakeFakeDigits.C | 2 +- FMD/scripts/MakeFakeHits.C | 2 +- FMD/scripts/MakeResidualAlignment.C | 2 +- FMD/scripts/PatternDigits.C | 2 +- FMD/scripts/PatternESD.C | 2 +- FMD/scripts/PatternRaw.C | 2 +- FMD/scripts/PatternRecs.C | 2 +- FMD/scripts/PatternSDigits.C | 2 +- FMD/scripts/PrintAlignment.C | 2 +- FMD/scripts/PrintCalibration.C | 2 +- FMD/scripts/Raw2ESD.C | 2 +- FMD/scripts/ReadRaw.C | 2 +- FMD/scripts/SpectraMonitor.C | 8 +++---- FMD/scripts/TestGainDA.C | 2 +- FMD/scripts/TestPedestalDA.C | 2 +- FMD/scripts/TestPreprocessor.C | 10 ++++---- FMD/scripts/TestRaw2SDigits.C | 2 +- FMD/scripts/TestRawReader.C | 2 +- GRP/TestGRPPreprocessor.C | 4 ++-- GRP/UpdateCDBCTPConfig.C | 2 +- GRP/UpdateCDBGRPEntry.C | 2 +- GRP/UpdateCDBGRPEntryMC.C | 2 +- GRP/UpdateCDBIdealGeom.C | 2 +- GRP/UpdateCDBVertexDiamond.C | 2 +- HLT/BASE/AliHLTMisc.h | 2 +- HLT/EMCAL/AliHLTEMCALCalibrationComponent.cxx | 2 +- HLT/EMCAL/AliHLTEMCALClusterizerComponent.cxx | 4 ++-- HLT/EMCAL/AliHLTEMCALTrackerComponent.cxx | 4 ++-- HLT/MUON/AliHLTMUONProcessor.cxx | 4 ++-- HLT/MUON/AliHLTMUONProcessor.h | 2 +- HLT/MUON/macros/CreateDefaultCDBEntries.C | 2 +- HLT/MUON/macros/CreateHitRecoLookupTables.C | 4 ++-- .../macros/CreateTriggerRecoLookupTables.C | 4 ++-- HLT/MUON/macros/MakeHitsTable.C | 2 +- HLT/MUON/macros/MakeTrackTable.C | 2 +- HLT/MUON/macros/MakeTriggerTable.C | 2 +- HLT/MUON/macros/RunChain.C | 22 +++++++++--------- HLT/MUON/macros/rootlogon.C | 2 +- HLT/MUON/utils/dHLTdumpraw.cxx | 2 +- HLT/MUON/utils/dHLTrootify.cxx | 2 +- HLT/TRD/AliHLTTRDCalibrationComponent.cxx | 2 +- HLT/TRD/AliHLTTRDClusterizerComponent.cxx | 2 +- HLT/TRD/AliHLTTRDTrackerComponent.cxx | 2 +- HLT/TRD/AliHLTTRDTrackerV1Component.cxx | 2 +- HLT/rec/AliHLTMisc.cxx | 2 +- HMPID/Hshuttle.C | 2 +- HMPID/MakeHMPIDFullMisAlignment.C | 2 +- HMPID/MakeHMPIDResMisAlignment.C | 2 +- HMPID/MakeHMPIDZeroMisAlignment.C | 2 +- HMPID/SurveyToAlignHmpid.C | 4 ++-- ITS/AliITSAnalizeSPDHits.C | 2 +- ITS/AliITSDCSAnalyzerSDD.cxx | 2 +- ITS/AliITSDetTypeSim.cxx | 2 +- ITS/AliITSFastOrCalibrationSPD.cxx | 2 +- ITS/AliITSFindClustersV2.C | 2 +- ITS/AliITSGeoPlot.C | 2 +- ITS/AliITSOnlineCalibrationSPDhandler.cxx | 16 ++++++------- ITS/AliITSPlaneEff.cxx | 2 +- ITS/AliITSPlaneEff.h | 2 +- ITS/AliITSPlaneEffSDD.h | 2 +- ITS/AliITSPlaneEffSPD.h | 2 +- ITS/AliITSPrintRecPoints.C | 2 +- ITS/AliITSQASSDDataMakerRec.cxx | 2 +- ITS/AliITSSurveyToAlignSSD.cxx | 2 +- ITS/AliITSspdLayer1Coverage.C | 2 +- ITS/DoVerticesSPD.C | 2 +- ITS/DrawITSAlignObj.C | 2 +- ITS/EvaluateSPDEffWithTracklets.C | 2 +- ITS/MakeCalibrationSSD.C | 2 +- ITS/MakeITSFullMisAlignment.C | 2 +- ITS/MakeITSMilleSuperModules.C | 2 +- ITS/MakeITSPlaneEfficiencySDD.C | 2 +- ITS/MakeITSPlaneEfficiencySPD.C | 2 +- ITS/MakeITSPlaneEfficiencySSD.C | 2 +- ITS/MakeITSResMisAlignment.C | 2 +- ITS/MakeITSZeroMisAlignment.C | 2 +- ITS/PlotSDDDigits.C | 2 +- ITS/ShowITSHitsRecPoints.C | 4 ++-- ITS/ShowSPDRecPoints.C | 2 +- ITS/TestPreprocessorSSD.C | 4 ++-- MUON/AliMUONCDB.h | 4 ++-- MUON/AliMUONGainEventGenerator.cxx | 2 +- MUON/AliMUONTriggerEfficiencyCells.h | 4 ++-- MUON/AliMUONTriggerGUI.cxx | 2 +- MUON/AlirootRun_MUONtest.sh | 4 ++-- MUON/AlirootRun_MUONtestAlign.sh | 6 ++--- MUON/AlirootRun_MUONtestlong.sh | 6 ++--- MUON/MUONCheck.C | 2 +- MUON/MUONCheckDI.C | 2 +- MUON/MUONClusterInfo.C | 2 +- MUON/MUONGenerateGeometryData.C | 2 +- MUON/MUONOfflineShift.C | 2 +- MUON/MUONReCalcGlobalTrigger.C | 2 +- MUON/MUONRefit.C | 2 +- MUON/MUONStatusMap.C | 2 +- MUON/MUONTrigger.C | 2 +- MUON/MUONTriggerEfficiency.C | 2 +- MUON/MUONefficiency.C | 2 +- MUON/MakeMUONFullMisAlignment.C | 2 +- MUON/MakeMUONRecoParamArray.C | 2 +- MUON/MakeMUONResMisAlignment.C | 2 +- MUON/MakeMUONSingleRecoParam.C | 2 +- MUON/MakeMUONZeroMisAlignment.C | 2 +- MUON/READMEbase.txt | 4 ++-- MUON/READMEcalib.txt | 4 ++-- MUON/READMEshuttle.txt | 16 ++++++------- MUON/READMEsim.txt | 2 +- MUON/TestMUONPreprocessor.C | 4 ++-- MUON/TestRecPoints.C | 2 +- MUON/UpdateCDBCTPConfig.C | 4 ++-- MUON/mapping/AliMpCDB.cxx | 10 ++++---- MUON/mapping/AliMpCDB.h | 10 ++++---- MUON/mchview.cxx | 2 +- MUON/runDataReconstruction.C | 6 ++--- MUON/runReconstruction.C | 2 +- MUON/runSimulation.C | 4 ++-- .../Calib/Data/Run0_9999999_v0_s0.root | Bin .../Align/Data/Run0_999999999_v0_s0.root | Bin .../EMCAL}/Calib/AliEMCALCalibCoefs.cxx | 0 .../EMCAL}/Calib/AliEMCALCalibCoefs.h | 0 {EMCAL => OCDB/EMCAL}/Calib/AliEMCALCell.cxx | 0 {EMCAL => OCDB/EMCAL}/Calib/AliEMCALCell.h | 0 .../EMCAL}/Calib/AliEMCALCellInfo.cxx | 0 .../EMCAL}/Calib/AliEMCALCellInfo.h | 0 .../EMCAL}/Calib/AliEMCALFolder.cxx | 0 {EMCAL => OCDB/EMCAL}/Calib/AliEMCALFolder.h | 0 .../EMCAL}/Calib/AliEMCALPi0Calibration.cxx | 0 .../EMCAL}/Calib/AliEMCALPi0Calibration.h | 0 .../Calib/AliEMCALPi0SelectionParam.cxx | 0 .../EMCAL}/Calib/AliEMCALPi0SelectionParam.h | 0 .../EMCAL}/Calib/AliEMCALSuperModule.cxx | 0 .../EMCAL}/Calib/AliEMCALSuperModule.h | 0 .../Calib/Data/Run0_999999999_v0_s0.root | Bin .../Calib/Mapping/Run0_999999999_v0_s0.root | Bin .../Calib/RecoParam/Run0_999999999_v0_s0.root | Bin .../Preprocessor/Run0_999999999_v0_s0.root | Bin .../Temperature/Run0_999999999_v0_s0.root | Bin .../FMD}/Align/Data/Run0_999999999_v0_s0.root | Bin .../Calib/AltroMap/Run0_999999_v0_s0.root | Bin .../FMD}/Calib/Dead/Run0_999999_v0_s0.root | Bin .../Calib/Pedestal/Run0_999999_v0_s0.root | Bin .../Calib/PulseGain/Run0_999999_v0_s0.root | Bin .../Calib/SampleRate/Run0_999999_v0_s0.root | Bin .../Calib/StripRange/Run0_999999_v0_s0.root | Bin .../ZeroSuppression/Run0_999999_v0_s0.root | Bin .../GRP}/Align/Data/Run0_999999999_v0_s0.root | Bin .../GRP}/CTP/Config/Run0_999999999_v0_s0.root | Bin {GRP => OCDB/GRP}/CTP/MUON.cfg | 0 {GRP => OCDB/GRP}/CTP/Pb-Pb.cfg | 0 {GRP => OCDB/GRP}/CTP/p-p.cfg | 0 {GRP => OCDB/GRP}/CTP/run.cfg | 0 {GRP => OCDB/GRP}/CTP/xcounters.txt | 0 .../MeanVertex/Run0_999999999_v0_s0.root | Bin .../MeanVertexTPC/Run0_999999999_v0_s0.root | Bin .../GRP}/GRP/Data/Run0_999999999_v0_s0.root | Bin .../Geometry/Data/Run0_999999999_v0_s0.root | Bin .../ConfigHLT/SolenoidBz/Run0_0_v0_s0.root | Bin .../Run0_999999999_v0_s0.root | Bin .../Run0_999999999_v0_s0.root | Bin .../MansoTrackerFSM/Run0_999999999_v0_s0.root | Bin .../Run0_999999999_v0_s0.root | Bin .../Align/Data/Run0_999999999_v0_s0.root | Bin .../Calib/DaqSig/Run0_999999999_v0_s0.root | Bin .../Calib/Nmean/Run0_999999999_v0_s0.root | Bin .../Calib/Qthre/Run0_999999999_v0_s0.root | Bin .../ITS}/Align/Data/Run0_999999999_v0_s0.root | Bin .../BadChannelsSSD/Run0_999999999_v0_s0.root | Bin .../Calib/CalibSDD/Run0_9999999_v0_s0.root | Bin .../Calib/DDLMapSDD/Run0_9999999_v0_s0.root | Bin .../DriftSpeedSDD/Run0_9999999_v0_s0.root | Bin .../Calib/GainSSD/Run0_999999999_v0_s0.root | Bin .../Calib/HLTforSDD/Run0_9999999_v0_s0.root | Bin .../Calib/MapsTimeSDD/Run0_9999999_v0_s0.root | Bin .../Calib/NoiseSSD/Run0_999999999_v0_s0.root | Bin .../Calib/RecoParam/Run0_999999999_v0_s0.root | Bin .../Calib/RespSDD/Run0_999999999_v0_s0.root | Bin .../Calib/SPDDead/Run0_9999999_v0_s0.root | Bin .../Calib/SPDFastOr/Run0_9999999_v0_s0.root | Bin .../Calib/SPDNoisy/Run0_9999999_v0_s0.root | Bin .../PlaneEffSDD/Run0_999999999_v0_s0.root | Bin .../PlaneEffSPD/Run0_999999999_v0_s0.root | Bin .../PlaneEffSSD/Run0_999999999_v0_s0.root | Bin .../Align/Data/Run0_999999999_v0_s0.root | Bin .../Capacitances/Run0_999999999_v0_s0.root | Bin .../Calib/DDLStore/Run0_999999999_v0_s0.root | Bin .../Calib/Gains/Run0_999999999_v0_s0.root | Bin .../Run0_999999999_v0_s0.root | Bin .../Run0_999999999_v0_s0.root | Bin .../MUON}/Calib/HV/Run0_999999999_v0_s0.root | Bin .../Run0_999999999_v0_s0.root | Bin .../Calib/Mapping/Run0_999999999_v0_s0.root | Bin .../MappingData/Run0_999999999_v0_s0.root | Bin .../MappingRunData/Run0_999999999_v0_s0.root | Bin .../Neighbours/Run0_999999999_v0_s0.root | Bin .../Calib/Pedestals/Run0_999999999_v0_s0.root | Bin .../Calib/RecoParam/Run0_999999999_v0_s0.root | Bin .../Run0_999999999_v0_s0.root | Bin .../Run0_999999999_v0_s0.root | Bin .../TriggerDCS/Run0_999999999_v0_s0.root | Bin .../Run0_999999999_v0_s0.root | Bin .../TriggerLut/Run0_999999999_v0_s0.root | Bin .../TriggerLut/Run0_999999999_v1_s0.root | Bin {PHOS => OCDB/PHOS}/Align/Data/README | 0 .../Align/Data/Run0_999999999_v0_s0.root | Bin .../CpvGainPedestals/Run0_999999_v0_s0.root | Bin .../EmcBadChannels/Run0_999999_v0_s0.root | Bin .../EmcGainPedestals/Run0_999999_v0_s0.root | Bin .../Calib/Mapping/Run0_999999999_v0_s0.root | Bin .../Calib/RecoParam/Run0_999999999_v0_s0.root | Bin .../PMD}/Align/Data/Run0_999999999_v0_s0.root | Bin .../PMD}/Calib/Gain/Run0_999999999_v0_s0.root | Bin .../PMD}/Calib/Ped/Run0_999999999_v0_s0.root | Bin .../T0}/Align/Data/Run0_999999999_v0_s0.root | Bin .../T0}/Align/Data/T0SurveyMisalignment.root | Bin .../Run0_999999999_v0_s0.root | Bin .../T0}/Calib/LookUp_Table/Run0_10_v0_s0.root | Bin .../LookUp_Table/Run0_9999999_v0_s1.root | Bin .../Calib/Slewing_Walk/Run0_999999_v0_s0.root | Bin .../Calib/TimeDelay/Run0_999999_v0_s0.root | Bin .../TOF}/Align/Data/Run0_999999999_v0_s0.root | Bin .../Calib/Config/Run0_999999999_v0_s0.root | Bin .../Calib/DCSData/Run0_999999999_v0_s0.root | Bin .../TOF}/Calib/HW/Run0_999999999_v0_s0.root | Bin .../Calib/Noise/Run0_999999999_v0_s0.root | Bin .../ParOffline/Run0_999999999_v0_s0.root | Bin .../Calib/ParOnline/Run0_999999999_v0_s0.root | Bin .../ParOnlineDelay/Run0_999999999_v0_s0.root | Bin .../Calib/Pulser/Run0_999999999_v0_s0.root | Bin .../Calib/RecPar/Run0_999999999_v0_s0.root | Bin .../Calib/RecoParam/Run0_999999999_v0_s0.root | Bin .../Calib/SimHisto/Run0_999999999_v0_s0.root | Bin .../Calib/Status/Run0_999999999_v0_s0.root | Bin .../TPC}/Align/Data/Run0_999999999_v0_s0.root | Bin .../ClusterParam/Run0_999999999_v0_s0.root | Bin .../ClusterParam/Run0_999999999_v0_s2.root | Bin .../GainFactorDedx/Run0_999999999_v0_s0.root | Bin {TPC => OCDB/TPC}/Calib/LaserTracks.root | Bin .../TPC}/Calib/MapCalibrationObjects.root | Bin .../Calib/Mapping/Run0_999999999_v0_s0.root | Bin .../PadGainFactor/Run0_999999999_v0_s1.root | Bin .../PadGainFactor/Run0_999999999_v0_s2.root | Bin .../Calib/PadNoise/Run0_999999999_v0_s1.root | Bin .../Calib/PadTime0/Run0_999999999_v0_s1.root | Bin .../Calib/PadTime0/Run0_999999999_v0_s3.root | Bin .../Parameters/Run0_999999999_v0_s1.root | Bin .../Parameters/Run0_999999999_v0_s2.root | Bin .../Calib/Pedestals/Run0_999999999_v0_s1.root | Bin .../Calib/RecoParam/Run0_999999999_v0_s0.root | Bin .../Temperature/Run0_999999999_v0_s0.root | Bin {TPC => OCDB/TPC}/Calib/tpcMapping.root | Bin .../Config/Goofie/Run0_999999999_v0_s0.root | Bin .../HLTTemperature/Run0_999999999_v0_s0.root | Bin .../HighVoltage/Run0_999999999_v0_s1.root | Bin .../HighVoltage/Run0_999999999_v0_s2.root | Bin .../HighVoltage/Run0_9999999_v0_s0.root | Bin .../HighVoltageStat/Run0_999999999_v0_s0.root | Bin .../Preprocessor/Run0_999999999_v0_s0.root | Bin .../Preprocessor/Run0_999999999_v0_s1.root | Bin .../Config/Pressure/Run0_9999999_v0_s0.root | Bin .../Temperature/Run0_999999999_v0_s1.root | Bin .../Temperature/Run0_999999999_v0_s2.root | Bin .../Temperature/Run0_9999999_v0_s0.root | Bin .../TRD}/Align/Data/Run0_999999999_v0_s0.root | Bin .../Run0_999999999_v0_s0.root | Bin .../ChamberStatus/Run0_999999999_v0_s0.root | Bin .../Calib/ChamberT0/Run0_999999999_v0_s0.root | Bin .../ChamberVdrift/Run0_999999999_v0_s0.root | Bin .../TRD}/Calib/DCS/Run0_999999999_v0_s0.root | Bin .../Calib/DetNoise/Run0_999999999_v0_s0.root | Bin .../TRD}/Calib/FEE/Run0_999999999_v0_s0.root | Bin .../LocalGainFactor/Run0_999999999_v0_s0.root | Bin .../Calib/LocalT0/Run0_999999999_v0_s0.root | Bin .../LocalVdrift/Run0_999999999_v0_s0.root | Bin .../MonitoringData/Run0_999999999_v0_s0.root | Bin .../Calib/PIDLQ/Run0_999999999_v0_s0.root | Bin .../Calib/PIDNN/Run0_999999999_v0_s0.root | Bin .../PIDThresholds/Run0_999999999_v0_s0.root | Bin .../Calib/PRFWidth/Run0_999999999_v0_s0.root | Bin .../Calib/PadNoise/Run0_999999999_v0_s0.root | Bin .../Calib/PadStatus/Run0_999999999_v0_s0.root | Bin .../Calib/RecoParam/Run0_999999999_v0_s0.root | Bin .../Align/Data/Run0_999999999_v0_s0.root | Bin .../VZERO}/Calib/Data/Run0_9999999_v0_s0.root | Bin .../ZDC}/Align/Data/Run0_999999999_v0_s0.root | Bin .../Calib/ChMap/Run0_999999999_v0_s0.root | Bin .../Calib/EMDCalib/Run0_999999999_v0_s0.root | Bin .../LaserCalib/Run0_999999999_v0_s0.root | Bin .../Calib/Pedestals/Run0_999999999_v0_s0.root | Bin .../Calib/RecoParam/Run0_999999999_v0_s0.root | Bin PHOS/AliPHOSRecoParam.cxx | 2 +- PHOS/MakePHOSFullMisAlignment.C | 4 ++-- PHOS/macros/AlignmentDB/AliPHOSSetAlignment.C | 6 ++--- .../AlignmentDB/MakePHOSAlignmentModule2.C | 4 ++-- PHOS/macros/BadModules/makeBadModESD.C | 2 +- PHOS/macros/BadModules/scanESD.C | 2 +- PHOS/macros/BeamTest2006/RawReconstruction.C | 2 +- .../macros/CalibrationDB/AliPHOSDecalibrate.C | 2 +- .../AliPHOSLocalReconstruction.C | 2 +- PHOS/macros/CalibrationDB/AliPHOSSetCDB.C | 4 ++-- PHOS/macros/Embed/RecRaw.C | 2 +- PMD/AliPMDCalibrator.cxx | 2 +- PMD/AliPMDPutCalibration.C | 2 +- PMD/AliPMDRec.C | 2 +- PMD/MakePMDFullMisAlignment.C | 2 +- PMD/MakePMDResMisAlignment.C | 2 +- PMD/PMDSurveyToAlignment_v1.C | 2 +- PMD/TestPMDPreprocessor.C | 2 +- PWG3/muondep/MuonTrackingEffAnalysis.C | 2 +- PWG3/muondep/RunRecoCheck.C | 2 +- SHUTTLE/TestShuttle/TestPreprocessor.C | 4 ++-- STEER/AliReconstruction.cxx | 2 +- STEER/AliSimulation.cxx | 2 +- STEER/CDBToGrid.C | 2 +- STEER/CheckCDBentries.C | 2 +- STEER/CreateMeanVertex.C | 2 +- STEER/MergeSetsOfAlignObjs.C | 2 +- T0/AliT0Align.cxx | 2 +- T0/AliT0CalibLaserData.cxx | 2 +- T0/AliT0SetCDB.C | 14 +++++------ T0/AliT0SetCDBcosmic.C | 12 +++++----- T0/readLaserData.C | 2 +- T0/readRawDDLT0.C | 2 +- TFluka/macro/FlukaConfig.C | 2 +- TOF/AliTOFcalib.cxx | 2 +- TOF/CreateCalibPars_Ideal.C | 2 +- TOF/CreateCalibPars_Miscalibrated.C | 2 +- TOF/CreateCalibPars_Miscalibrated_Scaled.C | 2 +- TOF/CreateConfigMap.C | 2 +- TOF/CreateIdealOnlineCalibPars.C | 2 +- TOF/CreateOnlineCalibPars.C | 2 +- TOF/CreateRecPars_CDB.C | 2 +- TOF/MakeTOFFullMisAlignment.C | 2 +- TOF/MakeTOFRecoParam.C | 2 +- TOF/MakeTOFResMisAlignment.C | 2 +- TOF/MakeTOFZeroMisAlignment.C | 2 +- TOF/TOFPreprocessor.C | 6 ++--- TOF/TOFPreprocessorFDR.C | 6 ++--- TPC/AliTPCAlign.cxx | 2 +- TPC/AliTPCClusterParam.cxx | 2 +- TPC/AliTPCComparison.C | 2 +- TPC/AliTPCGenDBTemp.cxx | 2 +- TPC/AliTPCcalibTracks.cxx | 2 +- TPC/AliTPCcalibUnlinearity.cxx | 2 +- TPC/Cal/AliTPCCreateDummyCDB.C | 2 +- TPC/CalibMacros/CalibClParam.C | 4 ++-- TPC/CalibMacros/CalibClParamNew.C | 2 +- TPC/CalibMacros/CalibEnv.C | 8 +++---- TPC/MakeTPCFullMisAlignment.C | 2 +- TPC/MakeTPCResMisAlignment.C | 2 +- TPC/MakeTPCZeroMisAlignment.C | 2 +- TPC/macros/CalibrateTPC.C | 2 +- TPC/macros/ConfigOCDB.C | 8 +++---- TPC/macros/MakeClusterParam.C | 2 +- TPC/macros/TestV0.C | 2 +- TPC/macros/gainCalib.C | 2 +- TPC/macros/recMag5.C | 14 +++++------ TPC/macros/testTPC/rec.C | 6 ++--- TPC/recTPC.C | 6 ++--- TPC/testMC/ConfigHM.C | 2 +- TPC/testMC/ConfigHPT1.C | 2 +- TPC/testMC/ConfigLM.C | 2 +- TPC/testMC/Config_AliGenCosmicsParam.C | 2 +- TPC/testMC/sim.C | 2 +- TRD/AliTRDalignment.cxx | 2 +- TRD/Cal/AliTRDCreateDummyCDB.C | 2 +- TRD/Cal/AliTRDbenchmarkCalibDB.C | 2 +- TRD/Cal/AliTRDmakePIDThresholds.C | 2 +- TRD/Cal/AliTRDmakeRecoParam.C | 2 +- TRD/Cal/AliTRDplotNoiseBaseline.C | 2 +- TRD/Macros/AliTRDCreateVector2DSum.C | 2 +- TRD/Macros/AliTRDFindTheCoef.C | 2 +- TRD/Macros/AliTRDMergeTwoTrees.C | 2 +- TRD/Macros/AliTRDanalyzeTestBeam.C | 2 +- TRD/Macros/AliTRDcompareDigits.C | 4 ++-- TRD/Macros/AliTRDdisplayDigits3D.C | 2 +- TRD/Macros/AliTRDpidCDB.C | 8 +++---- TRD/Macros/AliTRDreadRaw.C | 4 ++-- TRD/Macros/AliTRDreadRaw2Clusters.C | 2 +- TRD/Macros/AliTRDtestDigitsRW.C | 10 ++++---- TRD/Macros/ReadCDD.C | 2 +- TRD/MakeTRDFullMisAlignment.C | 2 +- TRD/MakeTRDResMisAlignment.C | 2 +- TRD/MakeTRDZeroMisAlignment.C | 2 +- TRD/TRDPEDESTALda.cxx | 2 +- TRD/TRDVDRIFTda.cxx | 2 +- TRD/TRDcalib/AliTRDcalib.cxx | 2 +- TRD/TRDcalib/AliTRDcalibV1.cxx | 2 +- TRD/qaRec/AliTRDclusterResolution.cxx | 2 +- TRD/qaRec/run.C | 2 +- VZERO/AliVZERODigitizer.cxx | 2 +- VZERO/AliVZEROQADataMakerRec.cxx | 2 +- VZERO/AliVZEROReconstructor.cxx | 2 +- VZERO/DBStorageCalib.C | 2 +- VZERO/DBStorageSurvey.C | 2 +- VZERO/MakeVZEROFullMisAlignment.C | 2 +- VZERO/MakeVZEROResMisAlignment.C | 2 +- VZERO/VZEROASurveyToAlignment.C | 2 +- VZERO/VZEROSurveyToAlignment.C | 2 +- ZDC/MakeZDCRecoParam.C | 2 +- ZDC/TestZDCPreprocessor.C | 6 ++--- macros/Config.C | 4 ++-- macros/ConfigBeautyPPR.C | 2 +- macros/ConfigCharmPPR.C | 2 +- macros/ConfigHBT.C | 2 +- macros/ConfigPPR.C | 2 +- macros/Config_AliGenCosmicsParam.C | 2 +- macros/Config_PDC06.C | 2 +- macros/Config_PDC06_MUON.C | 2 +- macros/Config_PDC07_MBias_MUON.C | 2 +- macros/Config_PythiaHeavyFlavours.C | 2 +- macros/MakeAllDETsFullMisAlignment.C | 2 +- macros/MakeAllDETsResMisAlignment.C | 2 +- macros/MakeAllDETsZeroMisAlignment.C | 2 +- macros/g4menu.C | 4 ++-- prod/LHC08d6/Config.C | 4 ++-- test/PbPbbench/rec.C | 4 ++-- test/PbPbbench/recraw/rec.C | 2 +- test/PbPbbench/sim.C | 4 ++-- test/QA/Save2OCDB.C | 2 +- test/QA/rawqa.C | 2 +- test/QA/rec.C | 4 ++-- test/QA/recqa.C | 4 ++-- test/QA/recraw.C | 4 ++-- test/QA/sim.C | 4 ++-- test/QA/simqa.C | 4 ++-- test/cosmic/rawqa.C | 2 +- test/cosmic/rec.C | 6 ++--- test/fpprod/rec.C | 2 +- test/fpprod/sim.C | 2 +- test/genkine/sim/rec.C | 2 +- test/genkine/sim/sim.C | 2 +- test/gun/rec.C | 2 +- test/gun/recraw/rec.C | 2 +- test/gun/sim.C | 2 +- test/merge/backgr/rec.C | 2 +- test/merge/backgr/sim.C | 2 +- test/merge/signal/rec.C | 2 +- test/merge/signal/sim.C | 2 +- test/pileup/rec.C | 2 +- test/pileup/sim.C | 2 +- test/ppbench/rec.C | 4 ++-- test/ppbench/recraw/rec.C | 2 +- test/ppbench/sim.C | 4 ++-- test/pploadlibs/rec.C | 2 +- test/pploadlibs/sim.C | 2 +- 491 files changed, 450 insertions(+), 450 deletions(-) rename {ACORDE => OCDB/ACORDE}/Calib/Data/Run0_9999999_v0_s0.root (100%) rename {EMCAL => OCDB/EMCAL}/Align/Data/Run0_999999999_v0_s0.root (100%) rename {EMCAL => OCDB/EMCAL}/Calib/AliEMCALCalibCoefs.cxx (100%) rename {EMCAL => OCDB/EMCAL}/Calib/AliEMCALCalibCoefs.h (100%) rename {EMCAL => OCDB/EMCAL}/Calib/AliEMCALCell.cxx (100%) rename {EMCAL => OCDB/EMCAL}/Calib/AliEMCALCell.h (100%) rename {EMCAL => OCDB/EMCAL}/Calib/AliEMCALCellInfo.cxx (100%) rename {EMCAL => OCDB/EMCAL}/Calib/AliEMCALCellInfo.h (100%) rename {EMCAL => OCDB/EMCAL}/Calib/AliEMCALFolder.cxx (100%) rename {EMCAL => OCDB/EMCAL}/Calib/AliEMCALFolder.h (100%) rename {EMCAL => OCDB/EMCAL}/Calib/AliEMCALPi0Calibration.cxx (100%) rename {EMCAL => OCDB/EMCAL}/Calib/AliEMCALPi0Calibration.h (100%) rename {EMCAL => OCDB/EMCAL}/Calib/AliEMCALPi0SelectionParam.cxx (100%) rename {EMCAL => OCDB/EMCAL}/Calib/AliEMCALPi0SelectionParam.h (100%) rename {EMCAL => OCDB/EMCAL}/Calib/AliEMCALSuperModule.cxx (100%) rename {EMCAL => OCDB/EMCAL}/Calib/AliEMCALSuperModule.h (100%) rename {EMCAL => OCDB/EMCAL}/Calib/Data/Run0_999999999_v0_s0.root (100%) rename {EMCAL => OCDB/EMCAL}/Calib/Mapping/Run0_999999999_v0_s0.root (100%) rename {EMCAL => OCDB/EMCAL}/Calib/RecoParam/Run0_999999999_v0_s0.root (100%) rename {EMCAL => OCDB/EMCAL}/Config/Preprocessor/Run0_999999999_v0_s0.root (100%) rename {EMCAL => OCDB/EMCAL}/Config/Temperature/Run0_999999999_v0_s0.root (100%) rename {FMD => OCDB/FMD}/Align/Data/Run0_999999999_v0_s0.root (100%) rename {FMD => OCDB/FMD}/Calib/AltroMap/Run0_999999_v0_s0.root (100%) rename {FMD => OCDB/FMD}/Calib/Dead/Run0_999999_v0_s0.root (100%) rename {FMD => OCDB/FMD}/Calib/Pedestal/Run0_999999_v0_s0.root (100%) rename {FMD => OCDB/FMD}/Calib/PulseGain/Run0_999999_v0_s0.root (100%) rename {FMD => OCDB/FMD}/Calib/SampleRate/Run0_999999_v0_s0.root (100%) rename {FMD => OCDB/FMD}/Calib/StripRange/Run0_999999_v0_s0.root (100%) rename {FMD => OCDB/FMD}/Calib/ZeroSuppression/Run0_999999_v0_s0.root (100%) rename {GRP => OCDB/GRP}/Align/Data/Run0_999999999_v0_s0.root (100%) rename {GRP => OCDB/GRP}/CTP/Config/Run0_999999999_v0_s0.root (100%) rename {GRP => OCDB/GRP}/CTP/MUON.cfg (100%) rename {GRP => OCDB/GRP}/CTP/Pb-Pb.cfg (100%) rename {GRP => OCDB/GRP}/CTP/p-p.cfg (100%) rename {GRP => OCDB/GRP}/CTP/run.cfg (100%) rename {GRP => OCDB/GRP}/CTP/xcounters.txt (100%) rename {GRP => OCDB/GRP}/Calib/MeanVertex/Run0_999999999_v0_s0.root (100%) rename {GRP => OCDB/GRP}/Calib/MeanVertexTPC/Run0_999999999_v0_s0.root (100%) rename {GRP => OCDB/GRP}/GRP/Data/Run0_999999999_v0_s0.root (100%) rename {GRP => OCDB/GRP}/Geometry/Data/Run0_999999999_v0_s0.root (100%) rename {HLT => OCDB/HLT}/ConfigHLT/SolenoidBz/Run0_0_v0_s0.root (100%) rename {HLT => OCDB/HLT}/ConfigMUON/DecisionComponent/Run0_999999999_v0_s0.root (100%) rename {HLT => OCDB/HLT}/ConfigMUON/HitReconstructor/Run0_999999999_v0_s0.root (100%) rename {HLT => OCDB/HLT}/ConfigMUON/MansoTrackerFSM/Run0_999999999_v0_s0.root (100%) rename {HLT => OCDB/HLT}/ConfigMUON/TriggerReconstructor/Run0_999999999_v0_s0.root (100%) rename {HMPID => OCDB/HMPID}/Align/Data/Run0_999999999_v0_s0.root (100%) rename {HMPID => OCDB/HMPID}/Calib/DaqSig/Run0_999999999_v0_s0.root (100%) rename {HMPID => OCDB/HMPID}/Calib/Nmean/Run0_999999999_v0_s0.root (100%) rename {HMPID => OCDB/HMPID}/Calib/Qthre/Run0_999999999_v0_s0.root (100%) rename {ITS => OCDB/ITS}/Align/Data/Run0_999999999_v0_s0.root (100%) rename {ITS => OCDB/ITS}/Calib/BadChannelsSSD/Run0_999999999_v0_s0.root (100%) rename {ITS => OCDB/ITS}/Calib/CalibSDD/Run0_9999999_v0_s0.root (100%) rename {ITS => OCDB/ITS}/Calib/DDLMapSDD/Run0_9999999_v0_s0.root (100%) rename {ITS => OCDB/ITS}/Calib/DriftSpeedSDD/Run0_9999999_v0_s0.root (100%) rename {ITS => OCDB/ITS}/Calib/GainSSD/Run0_999999999_v0_s0.root (100%) rename {ITS => OCDB/ITS}/Calib/HLTforSDD/Run0_9999999_v0_s0.root (100%) rename {ITS => OCDB/ITS}/Calib/MapsTimeSDD/Run0_9999999_v0_s0.root (100%) rename {ITS => OCDB/ITS}/Calib/NoiseSSD/Run0_999999999_v0_s0.root (100%) rename {ITS => OCDB/ITS}/Calib/RecoParam/Run0_999999999_v0_s0.root (100%) rename {ITS => OCDB/ITS}/Calib/RespSDD/Run0_999999999_v0_s0.root (100%) rename {ITS => OCDB/ITS}/Calib/SPDDead/Run0_9999999_v0_s0.root (100%) rename {ITS => OCDB/ITS}/Calib/SPDFastOr/Run0_9999999_v0_s0.root (100%) rename {ITS => OCDB/ITS}/Calib/SPDNoisy/Run0_9999999_v0_s0.root (100%) rename {ITS => OCDB/ITS}/PlaneEff/PlaneEffSDD/Run0_999999999_v0_s0.root (100%) rename {ITS => OCDB/ITS}/PlaneEff/PlaneEffSPD/Run0_999999999_v0_s0.root (100%) rename {ITS => OCDB/ITS}/PlaneEff/PlaneEffSSD/Run0_999999999_v0_s0.root (100%) rename {MUON => OCDB/MUON}/Align/Data/Run0_999999999_v0_s0.root (100%) rename {MUON => OCDB/MUON}/Calib/Capacitances/Run0_999999999_v0_s0.root (100%) rename {MUON => OCDB/MUON}/Calib/DDLStore/Run0_999999999_v0_s0.root (100%) rename {MUON => OCDB/MUON}/Calib/Gains/Run0_999999999_v0_s0.root (100%) rename {MUON => OCDB/MUON}/Calib/GlobalTriggerBoardMasks/Run0_999999999_v0_s0.root (100%) rename {MUON => OCDB/MUON}/Calib/GlobalTriggerCrateConfig/Run0_999999999_v0_s0.root (100%) rename {MUON => OCDB/MUON}/Calib/HV/Run0_999999999_v0_s0.root (100%) rename {MUON => OCDB/MUON}/Calib/LocalTriggerBoardMasks/Run0_999999999_v0_s0.root (100%) rename {MUON => OCDB/MUON}/Calib/Mapping/Run0_999999999_v0_s0.root (100%) rename {MUON => OCDB/MUON}/Calib/MappingData/Run0_999999999_v0_s0.root (100%) rename {MUON => OCDB/MUON}/Calib/MappingRunData/Run0_999999999_v0_s0.root (100%) rename {MUON => OCDB/MUON}/Calib/Neighbours/Run0_999999999_v0_s0.root (100%) rename {MUON => OCDB/MUON}/Calib/Pedestals/Run0_999999999_v0_s0.root (100%) rename {MUON => OCDB/MUON}/Calib/RecoParam/Run0_999999999_v0_s0.root (100%) rename {MUON => OCDB/MUON}/Calib/RegionalTriggerBoardMasks/Run0_999999999_v0_s0.root (100%) rename {MUON => OCDB/MUON}/Calib/RegionalTriggerConfig/Run0_999999999_v0_s0.root (100%) rename {MUON => OCDB/MUON}/Calib/TriggerDCS/Run0_999999999_v0_s0.root (100%) rename {MUON => OCDB/MUON}/Calib/TriggerEfficiency/Run0_999999999_v0_s0.root (100%) rename {MUON => OCDB/MUON}/Calib/TriggerLut/Run0_999999999_v0_s0.root (100%) rename {MUON => OCDB/MUON}/Calib/TriggerLut/Run0_999999999_v1_s0.root (100%) rename {PHOS => OCDB/PHOS}/Align/Data/README (100%) rename {PHOS => OCDB/PHOS}/Align/Data/Run0_999999999_v0_s0.root (100%) rename {PHOS => OCDB/PHOS}/Calib/CpvGainPedestals/Run0_999999_v0_s0.root (100%) rename {PHOS => OCDB/PHOS}/Calib/EmcBadChannels/Run0_999999_v0_s0.root (100%) rename {PHOS => OCDB/PHOS}/Calib/EmcGainPedestals/Run0_999999_v0_s0.root (100%) rename {PHOS => OCDB/PHOS}/Calib/Mapping/Run0_999999999_v0_s0.root (100%) rename {PHOS => OCDB/PHOS}/Calib/RecoParam/Run0_999999999_v0_s0.root (100%) rename {PMD => OCDB/PMD}/Align/Data/Run0_999999999_v0_s0.root (100%) rename {PMD => OCDB/PMD}/Calib/Gain/Run0_999999999_v0_s0.root (100%) rename {PMD => OCDB/PMD}/Calib/Ped/Run0_999999999_v0_s0.root (100%) rename {T0 => OCDB/T0}/Align/Data/Run0_999999999_v0_s0.root (100%) rename {T0 => OCDB/T0}/Align/Data/T0SurveyMisalignment.root (100%) rename {T0 => OCDB/T0}/Calib/Gain_TimeDelay_Slewing_Walk/Run0_999999999_v0_s0.root (100%) rename {T0 => OCDB/T0}/Calib/LookUp_Table/Run0_10_v0_s0.root (100%) rename {T0 => OCDB/T0}/Calib/LookUp_Table/Run0_9999999_v0_s1.root (100%) rename {T0 => OCDB/T0}/Calib/Slewing_Walk/Run0_999999_v0_s0.root (100%) rename {T0 => OCDB/T0}/Calib/TimeDelay/Run0_999999_v0_s0.root (100%) rename {TOF => OCDB/TOF}/Align/Data/Run0_999999999_v0_s0.root (100%) rename {TOF => OCDB/TOF}/Calib/Config/Run0_999999999_v0_s0.root (100%) rename {TOF => OCDB/TOF}/Calib/DCSData/Run0_999999999_v0_s0.root (100%) rename {TOF => OCDB/TOF}/Calib/HW/Run0_999999999_v0_s0.root (100%) rename {TOF => OCDB/TOF}/Calib/Noise/Run0_999999999_v0_s0.root (100%) rename {TOF => OCDB/TOF}/Calib/ParOffline/Run0_999999999_v0_s0.root (100%) rename {TOF => OCDB/TOF}/Calib/ParOnline/Run0_999999999_v0_s0.root (100%) rename {TOF => OCDB/TOF}/Calib/ParOnlineDelay/Run0_999999999_v0_s0.root (100%) rename {TOF => OCDB/TOF}/Calib/Pulser/Run0_999999999_v0_s0.root (100%) rename {TOF => OCDB/TOF}/Calib/RecPar/Run0_999999999_v0_s0.root (100%) rename {TOF => OCDB/TOF}/Calib/RecoParam/Run0_999999999_v0_s0.root (100%) rename {TOF => OCDB/TOF}/Calib/SimHisto/Run0_999999999_v0_s0.root (100%) rename {TOF => OCDB/TOF}/Calib/Status/Run0_999999999_v0_s0.root (100%) rename {TPC => OCDB/TPC}/Align/Data/Run0_999999999_v0_s0.root (100%) rename {TPC => OCDB/TPC}/Calib/ClusterParam/Run0_999999999_v0_s0.root (100%) rename {TPC => OCDB/TPC}/Calib/ClusterParam/Run0_999999999_v0_s2.root (100%) rename {TPC => OCDB/TPC}/Calib/GainFactorDedx/Run0_999999999_v0_s0.root (100%) rename {TPC => OCDB/TPC}/Calib/LaserTracks.root (100%) rename {TPC => OCDB/TPC}/Calib/MapCalibrationObjects.root (100%) rename {TPC => OCDB/TPC}/Calib/Mapping/Run0_999999999_v0_s0.root (100%) rename {TPC => OCDB/TPC}/Calib/PadGainFactor/Run0_999999999_v0_s1.root (100%) rename {TPC => OCDB/TPC}/Calib/PadGainFactor/Run0_999999999_v0_s2.root (100%) rename {TPC => OCDB/TPC}/Calib/PadNoise/Run0_999999999_v0_s1.root (100%) rename {TPC => OCDB/TPC}/Calib/PadTime0/Run0_999999999_v0_s1.root (100%) rename {TPC => OCDB/TPC}/Calib/PadTime0/Run0_999999999_v0_s3.root (100%) rename {TPC => OCDB/TPC}/Calib/Parameters/Run0_999999999_v0_s1.root (100%) rename {TPC => OCDB/TPC}/Calib/Parameters/Run0_999999999_v0_s2.root (100%) rename {TPC => OCDB/TPC}/Calib/Pedestals/Run0_999999999_v0_s1.root (100%) rename {TPC => OCDB/TPC}/Calib/RecoParam/Run0_999999999_v0_s0.root (100%) rename {TPC => OCDB/TPC}/Calib/Temperature/Run0_999999999_v0_s0.root (100%) rename {TPC => OCDB/TPC}/Calib/tpcMapping.root (100%) rename {TPC => OCDB/TPC}/Config/Goofie/Run0_999999999_v0_s0.root (100%) rename {TPC => OCDB/TPC}/Config/HLTTemperature/Run0_999999999_v0_s0.root (100%) rename {TPC => OCDB/TPC}/Config/HighVoltage/Run0_999999999_v0_s1.root (100%) rename {TPC => OCDB/TPC}/Config/HighVoltage/Run0_999999999_v0_s2.root (100%) rename {TPC => OCDB/TPC}/Config/HighVoltage/Run0_9999999_v0_s0.root (100%) rename {TPC => OCDB/TPC}/Config/HighVoltageStat/Run0_999999999_v0_s0.root (100%) rename {TPC => OCDB/TPC}/Config/Preprocessor/Run0_999999999_v0_s0.root (100%) rename {TPC => OCDB/TPC}/Config/Preprocessor/Run0_999999999_v0_s1.root (100%) rename {TPC => OCDB/TPC}/Config/Pressure/Run0_9999999_v0_s0.root (100%) rename {TPC => OCDB/TPC}/Config/Temperature/Run0_999999999_v0_s1.root (100%) rename {TPC => OCDB/TPC}/Config/Temperature/Run0_999999999_v0_s2.root (100%) rename {TPC => OCDB/TPC}/Config/Temperature/Run0_9999999_v0_s0.root (100%) rename {TRD => OCDB/TRD}/Align/Data/Run0_999999999_v0_s0.root (100%) rename {TRD => OCDB/TRD}/Calib/ChamberGainFactor/Run0_999999999_v0_s0.root (100%) rename {TRD => OCDB/TRD}/Calib/ChamberStatus/Run0_999999999_v0_s0.root (100%) rename {TRD => OCDB/TRD}/Calib/ChamberT0/Run0_999999999_v0_s0.root (100%) rename {TRD => OCDB/TRD}/Calib/ChamberVdrift/Run0_999999999_v0_s0.root (100%) rename {TRD => OCDB/TRD}/Calib/DCS/Run0_999999999_v0_s0.root (100%) rename {TRD => OCDB/TRD}/Calib/DetNoise/Run0_999999999_v0_s0.root (100%) rename {TRD => OCDB/TRD}/Calib/FEE/Run0_999999999_v0_s0.root (100%) rename {TRD => OCDB/TRD}/Calib/LocalGainFactor/Run0_999999999_v0_s0.root (100%) rename {TRD => OCDB/TRD}/Calib/LocalT0/Run0_999999999_v0_s0.root (100%) rename {TRD => OCDB/TRD}/Calib/LocalVdrift/Run0_999999999_v0_s0.root (100%) rename {TRD => OCDB/TRD}/Calib/MonitoringData/Run0_999999999_v0_s0.root (100%) rename {TRD => OCDB/TRD}/Calib/PIDLQ/Run0_999999999_v0_s0.root (100%) rename {TRD => OCDB/TRD}/Calib/PIDNN/Run0_999999999_v0_s0.root (100%) rename {TRD => OCDB/TRD}/Calib/PIDThresholds/Run0_999999999_v0_s0.root (100%) rename {TRD => OCDB/TRD}/Calib/PRFWidth/Run0_999999999_v0_s0.root (100%) rename {TRD => OCDB/TRD}/Calib/PadNoise/Run0_999999999_v0_s0.root (100%) rename {TRD => OCDB/TRD}/Calib/PadStatus/Run0_999999999_v0_s0.root (100%) rename {TRD => OCDB/TRD}/Calib/RecoParam/Run0_999999999_v0_s0.root (100%) rename {VZERO => OCDB/VZERO}/Align/Data/Run0_999999999_v0_s0.root (100%) rename {VZERO => OCDB/VZERO}/Calib/Data/Run0_9999999_v0_s0.root (100%) rename {ZDC => OCDB/ZDC}/Align/Data/Run0_999999999_v0_s0.root (100%) rename {ZDC => OCDB/ZDC}/Calib/ChMap/Run0_999999999_v0_s0.root (100%) rename {ZDC => OCDB/ZDC}/Calib/EMDCalib/Run0_999999999_v0_s0.root (100%) rename {ZDC => OCDB/ZDC}/Calib/LaserCalib/Run0_999999999_v0_s0.root (100%) rename {ZDC => OCDB/ZDC}/Calib/Pedestals/Run0_999999999_v0_s0.root (100%) rename {ZDC => OCDB/ZDC}/Calib/RecoParam/Run0_999999999_v0_s0.root (100%) diff --git a/ACORDE/AliACORDEDigitizer.cxx b/ACORDE/AliACORDEDigitizer.cxx index 09c406ceb2f..163c4b585e2 100644 --- a/ACORDE/AliACORDEDigitizer.cxx +++ b/ACORDE/AliACORDEDigitizer.cxx @@ -270,7 +270,7 @@ AliACORDECalibData* AliACORDEDigitizer::GetCalibData() const AliWarning("Load of calibration data from default storage failed!"); AliWarning("Calibration data will be loaded from local storage ($ALICE_ROOT)"); Int_t runNumber = man->GetRun(); - entry = man->GetStorage("local://$ALICE_ROOT") + entry = man->GetStorage("local://$ALICE_ROOT/OCDB") ->Get("ACORDE/Calib/Data",runNumber); } diff --git a/ACORDE/MakeACORDEFullMisAlignment.C b/ACORDE/MakeACORDEFullMisAlignment.C index 54d9fb56b2b..f1be52d8d4f 100644 --- a/ACORDE/MakeACORDEFullMisAlignment.C +++ b/ACORDE/MakeACORDEFullMisAlignment.C @@ -4,7 +4,7 @@ void MakeACORDEFullMisAlignment(){ const char* macroname = "MakeACORDEFullMisAlignment.C"; // Activate CDB storage and load geometry from CDB AliCDBManager* cdb = AliCDBManager::Instance(); - if(!cdb->IsDefaultStorageSet()) cdb->SetDefaultStorage("local://$ALICE_ROOT"); + if(!cdb->IsDefaultStorageSet()) cdb->SetDefaultStorage("local://$ALICE_ROOT/OCDB"); cdb->SetRun(0); AliCDBStorage* storage; diff --git a/ACORDE/MakeACORDEResMisAlignment.C b/ACORDE/MakeACORDEResMisAlignment.C index 22e70df072c..4527d66057e 100644 --- a/ACORDE/MakeACORDEResMisAlignment.C +++ b/ACORDE/MakeACORDEResMisAlignment.C @@ -4,7 +4,7 @@ void MakeACORDEResMisAlignment(){ const char* macroname = "MakeACORDEResMisAlignment.C"; // Activate CDB storage and load geometry from CDB AliCDBManager* cdb = AliCDBManager::Instance(); - if(!cdb->IsDefaultStorageSet()) cdb->SetDefaultStorage("local://$ALICE_ROOT"); + if(!cdb->IsDefaultStorageSet()) cdb->SetDefaultStorage("local://$ALICE_ROOT/OCDB"); cdb->SetRun(0); AliCDBStorage* storage; diff --git a/ACORDE/MakeACORDEZeroMisAlignment.C b/ACORDE/MakeACORDEZeroMisAlignment.C index 2230aced414..985625731f7 100644 --- a/ACORDE/MakeACORDEZeroMisAlignment.C +++ b/ACORDE/MakeACORDEZeroMisAlignment.C @@ -4,7 +4,7 @@ void MakeACORDEZeroMisAlignment(){ const char* macroname = "MakeACORDEZeroMisAlignment.C"; // Activate CDB storage and load geometry from CDB AliCDBManager* cdb = AliCDBManager::Instance(); - if(!cdb->IsDefaultStorageSet()) cdb->SetDefaultStorage("local://$ALICE_ROOT/ACORDE/Align/Data"); + if(!cdb->IsDefaultStorageSet()) cdb->SetDefaultStorage("local://$ALICE_ROOT/OCDB/ACORDE/Align/Data"); cdb->SetRun(0); AliCDBStorage* storage; diff --git a/ACORDE/macros/DBStorageCalib.C b/ACORDE/macros/DBStorageCalib.C index 547f57c8143..a93051f4cfb 100644 --- a/ACORDE/macros/DBStorageCalib.C +++ b/ACORDE/macros/DBStorageCalib.C @@ -3,7 +3,7 @@ void DBStorageCalib(){ AliCDBManager *man = AliCDBManager::Instance(); AliCDBStorage *storLoc; -man->SetDefaultStorage("local://$ALICE_ROOT"); +man->SetDefaultStorage("local://$ALICE_ROOT/OCDB"); AliACORDECalibData *calibda = new AliACORDECalibData("Calib"); diff --git a/EMCAL/AliEMCALRecParam.cxx b/EMCAL/AliEMCALRecParam.cxx index 5d509befb28..1891ee06ce8 100644 --- a/EMCAL/AliEMCALRecParam.cxx +++ b/EMCAL/AliEMCALRecParam.cxx @@ -345,7 +345,7 @@ const TObjArray* AliEMCALRecParam::GetMappings() //If not found, read it from OCDB. //Quick check as follows: - // root [0] AliCDBManager::Instance()->SetDefaultStorage("local://$ALICE_ROOT" + // root [0] AliCDBManager::Instance()->SetDefaultStorage("local://$ALICE_ROOT/OCDB" // root [1] AliCDBManager::Instance()->SetRun(1); // root [2] TObjArray* maps = AliEMCALRecParam::GetMappings(); // root [3] maps->Print(); diff --git a/EMCAL/MakeEMCALFullMisAlignment.C b/EMCAL/MakeEMCALFullMisAlignment.C index 2796e392f92..8855e641812 100644 --- a/EMCAL/MakeEMCALFullMisAlignment.C +++ b/EMCAL/MakeEMCALFullMisAlignment.C @@ -12,7 +12,7 @@ void MakeEMCALFullMisAlignment(){ // Activate CDB storage and load geometry from CDB AliCDBManager* cdb = AliCDBManager::Instance(); - if(!cdb->IsDefaultStorageSet()) cdb->SetDefaultStorage("local://$ALICE_ROOT"); + if(!cdb->IsDefaultStorageSet()) cdb->SetDefaultStorage("local://$ALICE_ROOT/OCDB"); cdb->SetRun(0); AliCDBStorage* storage; diff --git a/EMCAL/MakeEMCALResMisAlignment.C b/EMCAL/MakeEMCALResMisAlignment.C index 3e02b52ca27..ff5e5cd0ebe 100644 --- a/EMCAL/MakeEMCALResMisAlignment.C +++ b/EMCAL/MakeEMCALResMisAlignment.C @@ -14,7 +14,7 @@ void MakeEMCALResMisAlignment(){ // Activate CDB storage and load geometry from CDB AliCDBManager* cdb = AliCDBManager::Instance(); - if(!cdb->IsDefaultStorageSet()) cdb->SetDefaultStorage("local://$ALICE_ROOT"); + if(!cdb->IsDefaultStorageSet()) cdb->SetDefaultStorage("local://$ALICE_ROOT/OCDB"); cdb->SetRun(0); AliCDBStorage* storage; diff --git a/EMCAL/beamtest07/Rec.C b/EMCAL/beamtest07/Rec.C index 2a53633c091..616c8a166b4 100644 --- a/EMCAL/beamtest07/Rec.C +++ b/EMCAL/beamtest07/Rec.C @@ -7,8 +7,8 @@ void Rec(TString file="/scratch/alicehp2/commun/testbeam07/LHC07a_EMCAL/00000019 // Boris Polichtchouk, 31 Aug 2007 - AliCDBManager::Instance()->SetDefaultStorage("local://$ALICE_ROOT"); - AliCDBManager::Instance()->SetSpecificStorage("EMCAL/Calib/Data","local://$ALICE_ROOT/EMCAL/beamtest07/"); + AliCDBManager::Instance()->SetDefaultStorage("local://$ALICE_ROOT/OCDB"); + AliCDBManager::Instance()->SetSpecificStorage("EMCAL/Calib/Data","local://$ALICE_ROOT/OCDB/EMCAL/beamtest07/"); //AliLog::SetGlobalDebugLevel(2); diff --git a/EMCAL/beamtest07/SetCalibDB.C b/EMCAL/beamtest07/SetCalibDB.C index 37809b4cc83..5decb10af99 100644 --- a/EMCAL/beamtest07/SetCalibDB.C +++ b/EMCAL/beamtest07/SetCalibDB.C @@ -21,7 +21,7 @@ void SetCalibDB() { Int_t beamPeriod = 1; char* objFormat = ""; - TString DBFolder ="local://$ALICE_ROOT/EMCAL/beamtest07"; + TString DBFolder ="local://$ALICE_ROOT/OCDB/EMCAL/beamtest07"; firstRun = 0; lastRun = 999999999; objFormat = "EMCAL beam test 2007 gain factors and pedestals"; diff --git a/EMCAL/macros/AlignmentDB/AliEMCALSetAlignment.C b/EMCAL/macros/AlignmentDB/AliEMCALSetAlignment.C index 18de533be5c..496e29f1786 100755 --- a/EMCAL/macros/AlignmentDB/AliEMCALSetAlignment.C +++ b/EMCAL/macros/AlignmentDB/AliEMCALSetAlignment.C @@ -90,7 +90,7 @@ void IdealAlignment() // Make CDB storage and put TClonesArray in // AliCDBManager *CDB = AliCDBManager::Instance(); - CDB->SetDefaultStorage("local://$ALICE_ROOT"); + CDB->SetDefaultStorage("local://$ALICE_ROOT/OCDB"); AliCDBMetaData *md= new AliCDBMetaData(); md->SetResponsible("EMCAL Expert"); @@ -146,7 +146,7 @@ void ResidualAlignment() // Make CDB storage and put TClonesArray in // AliCDBManager *CDB = AliCDBManager::Instance(); - CDB->SetDefaultStorage("local://$ALICE_ROOT"); + CDB->SetDefaultStorage("local://$ALICE_ROOT/OCDB"); AliCDBMetaData *md= new AliCDBMetaData(); md->SetResponsible("EMCAL Expert"); @@ -202,7 +202,7 @@ void FullMisalignment() // Make CDB storage and put TClonesArray in // AliCDBManager *CDB = AliCDBManager::Instance(); - CDB->SetDefaultStorage("local://$ALICE_ROOT"); + CDB->SetDefaultStorage("local://$ALICE_ROOT/OCDB"); AliCDBMetaData *md= new AliCDBMetaData(); md->SetResponsible("EMCAL Expert"); diff --git a/EMCAL/macros/CalibrationDB/AliEMCALDecalibrate.C b/EMCAL/macros/CalibrationDB/AliEMCALDecalibrate.C index adc1e3bb34e..4cef9ce4ce8 100644 --- a/EMCAL/macros/CalibrationDB/AliEMCALDecalibrate.C +++ b/EMCAL/macros/CalibrationDB/AliEMCALDecalibrate.C @@ -10,7 +10,7 @@ void AliEMCALDecalibrate(Int_t nevents=3) { //Use "decalibration" database to simulate decalibrated EMCAL. - AliCDBManager::Instance()->SetDefaultStorage("local://$ALICE_ROOT"); + AliCDBManager::Instance()->SetDefaultStorage("local://$ALICE_ROOT/OCDB"); AliCDBManager::Instance()->SetSpecificStorage("EMCAL","local://DeCalibDB"); //Make digitization, calibration parameters will be taken from CDB diff --git a/EMCAL/macros/CalibrationDB/get_pedestalAll.C b/EMCAL/macros/CalibrationDB/get_pedestalAll.C index 7d67b22a3a1..66c3253201f 100755 --- a/EMCAL/macros/CalibrationDB/get_pedestalAll.C +++ b/EMCAL/macros/CalibrationDB/get_pedestalAll.C @@ -221,7 +221,7 @@ void get_pedestalAll(int runNumber = 33, //Save calibration objects to OCDB. if(saveDb) { - AliCDBManager::Instance()->SetDefaultStorage("local://$ALICE_ROOT"); + AliCDBManager::Instance()->SetDefaultStorage("local://$ALICE_ROOT/OCDB"); AliCDBManager::Instance()->SetSpecificStorage("EMCAL/*",DBFolder.Data()); AliCDBMetaData md; diff --git a/EMCAL/macros/QaDB/makeEMCALQARef.C b/EMCAL/macros/QaDB/makeEMCALQARef.C index 84745ed1060..8f2a7d10fb1 100644 --- a/EMCAL/macros/QaDB/makeEMCALQARef.C +++ b/EMCAL/macros/QaDB/makeEMCALQARef.C @@ -15,9 +15,9 @@ void makeEMCALQARef(Int_t runNumber = 0, Int_t viewHistos = 0) { // Save QA data generated by DataMaker into OCDB AliCDBManager * man = AliCDBManager::Instance(); - man->SetDefaultStorage("local://$ALICE_ROOT"); + man->SetDefaultStorage("local://$ALICE_ROOT/OCDB"); // where ? - AliQA::SetQARefStorage("local://$ALICE_ROOT"); + AliQA::SetQARefStorage("local://$ALICE_ROOT/OCDB"); // what ? AliQA::SetQARefDataDirName("Sim") ; //Data, Pedestals, BlackEvent,..... diff --git a/EVE/EveBase/AliEveEventManager.cxx b/EVE/EveBase/AliEveEventManager.cxx index 6dc80cd58e8..8e7ae71c72e 100644 --- a/EVE/EveBase/AliEveEventManager.cxx +++ b/EVE/EveBase/AliEveEventManager.cxx @@ -75,7 +75,7 @@ Bool_t AliEveEventManager::fgAssertRaw = kFALSE; TString AliEveEventManager::fgESDFileName("AliESDs.root"); TString AliEveEventManager::fgAODFileName("AliAOD.root"); TString AliEveEventManager::fgRawFileName("raw.root"); -TString AliEveEventManager::fgCdbUri("local://$ALICE_ROOT"); +TString AliEveEventManager::fgCdbUri("local://$ALICE_ROOT/OCDB"); TList* AliEveEventManager::fgAODfriends = 0; @@ -203,7 +203,7 @@ void AliEveEventManager::SetRawFileName(const TString& raw) void AliEveEventManager::SetCdbUri(const TString& cdb) { - // Set path to CDB, default "local://$ALICE_ROOT". + // Set path to CDB, default "local://$ALICE_ROOT/OCDB". if ( ! cdb.IsNull()) fgCdbUri = cdb; } diff --git a/EVE/EveDet/AliEveTRDModuleImp.cxx b/EVE/EveDet/AliEveTRDModuleImp.cxx index a57a582d41f..6e6383cc0b9 100644 --- a/EVE/EveDet/AliEveTRDModuleImp.cxx +++ b/EVE/EveDet/AliEveTRDModuleImp.cxx @@ -470,7 +470,7 @@ void AliEveTRDChamber::SetGeometry(AliTRDgeometry *geo) // eg_shape->StampColorSelection(); if(!(gGeoManager)){ AliCDBManager *fCDBManager=AliCDBManager::Instance(); - fCDBManager->SetDefaultStorage("local://$ALICE_ROOT"); + fCDBManager->SetDefaultStorage("local://$ALICE_ROOT/OCDB"); fCDBManager->SetRun(0); AliEveEventManager::AssertGeometry(); } diff --git a/EVE/alice-macros/trd_loader.C b/EVE/alice-macros/trd_loader.C index c8c5ade4746..60c789cda7f 100644 --- a/EVE/alice-macros/trd_loader.C +++ b/EVE/alice-macros/trd_loader.C @@ -6,7 +6,7 @@ // Usage: // .L trd_loader.C // AliCDBManager *cdb = AliCDBManager::Instance(); -// cdb->SetDefaultStorage("local://$ALICE_ROOT"); +// cdb->SetDefaultStorage("local://$ALICE_ROOT/OCDB"); // cdb->SetRun(0) // AliEveTRDLoader *loader = trd_loader(); // loader->NextEvent(); diff --git a/EVE/alice-macros/trd_qaRec.C b/EVE/alice-macros/trd_qaRec.C index 312a40ba3de..537e4e4971e 100644 --- a/EVE/alice-macros/trd_qaRec.C +++ b/EVE/alice-macros/trd_qaRec.C @@ -13,7 +13,7 @@ void trd_qaRec() gROOT->cd(); AliCDBManager *cdb = AliCDBManager::Instance(); - cdb->SetDefaultStorage("local://$ALICE_ROOT"); + cdb->SetDefaultStorage("local://$ALICE_ROOT/OCDB"); cdb->SetRun(0); AliEveEventManager::AssertGeometry(); diff --git a/EVE/hlt-macros/geom_hlt.C b/EVE/hlt-macros/geom_hlt.C index 67c6ff51401..058815b0bba 100644 --- a/EVE/hlt-macros/geom_hlt.C +++ b/EVE/hlt-macros/geom_hlt.C @@ -52,7 +52,7 @@ Int_t MUON_geom() gEve->DisableRedraw(); AliCDBManager *cdb = AliCDBManager::Instance(); - cdb->SetDefaultStorage("local://$ALICE_ROOT"); + cdb->SetDefaultStorage("local://$ALICE_ROOT/OCDB"); cdb->SetRun(0); AliEveMUONData *g_muon_data = new AliEveMUONData; diff --git a/EVE/hlt-macros/homer_display.C b/EVE/hlt-macros/homer_display.C index cbb79eb9b7f..a36f2b07d8f 100644 --- a/EVE/hlt-macros/homer_display.C +++ b/EVE/hlt-macros/homer_display.C @@ -136,7 +136,7 @@ TEveTrack* makeESDTrack( TEveTrackPropagator* rnrStyle, void homer_display( Int_t run = 0) { AliCDBManager::Instance()->SetRun(run); - AliCDBManager::Instance()->SetDefaultStorage("local://$ALICE_ROOT"); + AliCDBManager::Instance()->SetDefaultStorage("local://$ALICE_ROOT/OCDB"); gMemReader = new AliRawReaderMemory(0, 0); diff --git a/EVE/macros/display.C b/EVE/macros/display.C index f89f3a443a2..93fa0563a02 100644 --- a/EVE/macros/display.C +++ b/EVE/macros/display.C @@ -33,7 +33,7 @@ public: fHasRaw(kFALSE), fHasESD(kFALSE) { - AliEveEventManager::SetCdbUri(TString("local://$ALICE_ROOT")); + AliEveEventManager::SetCdbUri(TString("local://$ALICE_ROOT/OCDB")); LoadMacros(); Setup(file, false); SetupSelect(); @@ -387,7 +387,7 @@ Display* Display::fgInstance = 0; Display* display(const char* file="") { // TGeoManager::Import(geom); - // AliCDBManager::Instance()->SetDefaultStorage("local://$ALICE_ROOT"); + // AliCDBManager::Instance()->SetDefaultStorage("local://$ALICE_ROOT/OCDB"); // AliCDBManager::Instance()->SetRun(0); // AliGeomManager::LoadGeometry("geometry.root"); diff --git a/FMD/AliFMDBackgroundCorrection.cxx b/FMD/AliFMDBackgroundCorrection.cxx index de431d67823..4ebecb4f561 100644 --- a/FMD/AliFMDBackgroundCorrection.cxx +++ b/FMD/AliFMDBackgroundCorrection.cxx @@ -112,7 +112,7 @@ void AliFMDBackgroundCorrection::GenerateBackgroundCorrection(Bool_t from_hits, Simulate(nEvents); else { //AliCDBManager::Instance()->SetDefaultStorage("alien://Folder=/alice/data/2008/LHC08d/OCDB/"); - AliCDBManager::Instance()->SetDefaultStorage("local://$ALICE_ROOT"); + AliCDBManager::Instance()->SetDefaultStorage("local://$ALICE_ROOT/OCDB"); AliCDBManager::Instance()->SetRun(runNo); #if defined(__CINT__) @@ -270,7 +270,7 @@ void AliFMDBackgroundCorrection::GenerateBackgroundCorrection(Bool_t from_hits, if(storeInAlien) { AliCDBManager* cdb = AliCDBManager::Instance(); - cdb->SetDefaultStorage("local://$ALICE_ROOT"); + cdb->SetDefaultStorage("local://$ALICE_ROOT/OCDB"); AliCDBId id(AliFMDAnaParameters::GetBackgroundPath(),runNo,endRunNo); AliCDBMetaData* meta = new AliCDBMetaData; diff --git a/FMD/AliFMDCalibFaker.cxx b/FMD/AliFMDCalibFaker.cxx index 570abd7d0bf..6e54ce61fc7 100644 --- a/FMD/AliFMDCalibFaker.cxx +++ b/FMD/AliFMDCalibFaker.cxx @@ -27,7 +27,7 @@ // the bit mask passed to the constructor, or added by `AddCalib'. // // The default is to write all calibration parameters to a local -// storage `local://$ALICE_ROOT' which is were the sources live (sigh! +// storage `local://$ALICE_ROOT/OCDB' which is were the sources live (sigh! // - why oh why do we need to shit where we eat - it's just not // healty). // diff --git a/FMD/AliFMDPreprocessor.cxx b/FMD/AliFMDPreprocessor.cxx index 388611ce475..57fc71fedd3 100644 --- a/FMD/AliFMDPreprocessor.cxx +++ b/FMD/AliFMDPreprocessor.cxx @@ -148,7 +148,7 @@ UInt_t AliFMDPreprocessor::Process(TMap* /* dcsAliasMap */) // // 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); AliFMDParameters* pars = AliFMDParameters::Instance(); pars->Init(this, false, AliFMDParameters::kAltroMap); diff --git a/FMD/MakeFMDFullMisAlignment.C b/FMD/MakeFMDFullMisAlignment.C index f92b5270252..e1144c31230 100644 --- a/FMD/MakeFMDFullMisAlignment.C +++ b/FMD/MakeFMDFullMisAlignment.C @@ -5,7 +5,7 @@ void MakeFMDFullMisAlignment() // Activate CDB storage and load geometry from CDB AliCDBManager* cdb = AliCDBManager::Instance(); - if(!cdb->IsDefaultStorageSet()) cdb->SetDefaultStorage("local://$ALICE_ROOT"); + if(!cdb->IsDefaultStorageSet()) cdb->SetDefaultStorage("local://$ALICE_ROOT/OCDB"); cdb->SetRun(0); Bool_t toCdb = TString(gSystem->Getenv("TOCDB")) == TString("kTRUE"); diff --git a/FMD/MakeFMDResMisAlignment.C b/FMD/MakeFMDResMisAlignment.C index acc7b056b24..2fcd20f0b67 100644 --- a/FMD/MakeFMDResMisAlignment.C +++ b/FMD/MakeFMDResMisAlignment.C @@ -6,7 +6,7 @@ void MakeFMDResMisAlignment() // Activate CDB storage and load geometry from CDB AliCDBManager* cdb = AliCDBManager::Instance(); - if(!cdb->IsDefaultStorageSet()) cdb->SetDefaultStorage("local://$ALICE_ROOT"); + if(!cdb->IsDefaultStorageSet()) cdb->SetDefaultStorage("local://$ALICE_ROOT/OCDB"); cdb->SetRun(0); Bool_t toCdb = TString(gSystem->Getenv("TOCDB")) == TString("kTRUE"); diff --git a/FMD/MakeFMDZeroMisAlignment.C b/FMD/MakeFMDZeroMisAlignment.C index 9efadb812a9..426fb089e46 100644 --- a/FMD/MakeFMDZeroMisAlignment.C +++ b/FMD/MakeFMDZeroMisAlignment.C @@ -6,7 +6,7 @@ void MakeFMDZeroMisAlignment() // Activate CDB storage and load geometry from CDB AliCDBManager* cdb = AliCDBManager::Instance(); - if(!cdb->IsDefaultStorageSet()) cdb->SetDefaultStorage("local://$ALICE_ROOT"); + if(!cdb->IsDefaultStorageSet()) cdb->SetDefaultStorage("local://$ALICE_ROOT/OCDB"); cdb->SetRun(0); Bool_t toCdb = TString(gSystem->Getenv("TOCDB")) == TString("kTRUE"); diff --git a/FMD/Reconstruct.C b/FMD/Reconstruct.C index 5a73e1f4155..4180f5b4b46 100644 --- a/FMD/Reconstruct.C +++ b/FMD/Reconstruct.C @@ -36,7 +36,7 @@ Reconstruct() // AliMagF* mag = static_cast(magF->Get("mag")); // if (!mag) return; // AliTracker::SetFieldMap(mag, true); - AliCDBManager::Instance()->SetDefaultStorage("local://$ALICE_ROOT"); + AliCDBManager::Instance()->SetDefaultStorage("local://$ALICE_ROOT/OCDB"); AliCDBManager::Instance()->SetRun(0); AliReconstruction rec; diff --git a/FMD/analysis/RunAliEnFMDAnalysis.C b/FMD/analysis/RunAliEnFMDAnalysis.C index b718406fdb5..b2f4829e33e 100644 --- a/FMD/analysis/RunAliEnFMDAnalysis.C +++ b/FMD/analysis/RunAliEnFMDAnalysis.C @@ -1,5 +1,5 @@ void RunAliEnFMDAnalysis(const Char_t* collectionfile = "collection.xml", - const Char_t* cdbPath = "local://$ALICE_ROOT", + const Char_t* cdbPath = "local://$ALICE_ROOT/OCDB", const Char_t* outFile = "fmd_analysis.root"){ gSystem->Load("libANALYSIS"); diff --git a/FMD/analysis/RunAliEnFMDAnalysisSE.C b/FMD/analysis/RunAliEnFMDAnalysisSE.C index e43e51b0edc..c749bac853c 100644 --- a/FMD/analysis/RunAliEnFMDAnalysisSE.C +++ b/FMD/analysis/RunAliEnFMDAnalysisSE.C @@ -1,4 +1,4 @@ -void RunAliEnFMDAnalysisSE(const Char_t* collectionName="collection.xml", const Char_t* cdbPath="local://$ALICE_ROOT") { +void RunAliEnFMDAnalysisSE(const Char_t* collectionName="collection.xml", const Char_t* cdbPath="local://$ALICE_ROOT/OCDB") { gSystem->Load("libANALYSIS"); gSystem->Load("libANALYSISalice"); diff --git a/FMD/analysis/RunLocalFMDAnalysis.C b/FMD/analysis/RunLocalFMDAnalysis.C index 0af36d620c9..ce9ebaa742b 100644 --- a/FMD/analysis/RunLocalFMDAnalysis.C +++ b/FMD/analysis/RunLocalFMDAnalysis.C @@ -1,5 +1,5 @@ void RunLocalFMDAnalysis(const Char_t* filename= "AliESDs.root", - const Char_t* cdbPath = "local://$ALICE_ROOT", + const Char_t* cdbPath = "local://$ALICE_ROOT/OCDB", const Char_t* outFile = "fmd_analysis.root"){ gSystem->Load("libANALYSIS"); diff --git a/FMD/analysis/RunLocalFMDAnalysisSE.C b/FMD/analysis/RunLocalFMDAnalysisSE.C index a9f985c9dfb..b60f7f248d1 100644 --- a/FMD/analysis/RunLocalFMDAnalysisSE.C +++ b/FMD/analysis/RunLocalFMDAnalysisSE.C @@ -1,4 +1,4 @@ -void RunLocalFMDAnalysisSE(const Char_t* filename= "AliESDs.root", const Char_t* cdbPath="local://$ALICE_ROOT", const Char_t* outFile = "fmd_analysis.root") { +void RunLocalFMDAnalysisSE(const Char_t* filename= "AliESDs.root", const Char_t* cdbPath="local://$ALICE_ROOT/OCDB", const Char_t* outFile = "fmd_analysis.root") { gSystem->Load("libANALYSIS"); gSystem->Load("libANALYSISalice"); diff --git a/FMD/scripts/Convert2Raw.C b/FMD/scripts/Convert2Raw.C index 4de18becb03..b9ce6be5543 100644 --- a/FMD/scripts/Convert2Raw.C +++ b/FMD/scripts/Convert2Raw.C @@ -13,7 +13,7 @@ Convert2Raw() { AliCDBManager* cdb = AliCDBManager::Instance(); cdb->SetRun(0); - cdb->SetDefaultStorage("local://$ALICE_ROOT"); + cdb->SetDefaultStorage("local://$ALICE_ROOT/OCDB"); AliRunLoader* runLoader = AliRunLoader::Open("galice.root", "Alice", "read"); runLoader->LoadgAlice(); diff --git a/FMD/scripts/Digits2Raw.C b/FMD/scripts/Digits2Raw.C index 1ef77b2b62f..114f14fc554 100644 --- a/FMD/scripts/Digits2Raw.C +++ b/FMD/scripts/Digits2Raw.C @@ -32,7 +32,7 @@ Digits2Raw() TTree* treeE = runLoader->TreeE(); AliCDBManager::Instance()->SetRun(0); - AliCDBManager::Instance()->SetDefaultStorage("local://$ALICE_ROOT"); + AliCDBManager::Instance()->SetDefaultStorage("local://$ALICE_ROOT/OCDB"); AliFMDParameters::Instance()->Init(kFALSE, (AliFMDParameters::kPulseGain| diff --git a/FMD/scripts/DisplayDigits.C b/FMD/scripts/DisplayDigits.C index 5f162b4e988..1e886a8809f 100644 --- a/FMD/scripts/DisplayDigits.C +++ b/FMD/scripts/DisplayDigits.C @@ -11,7 +11,7 @@ void DisplayDigits() { AliCDBManager* cdb = AliCDBManager::Instance(); - cdb->SetDefaultStorage("local://$ALICE_ROOT"); + cdb->SetDefaultStorage("local://$ALICE_ROOT/OCDB"); cdb->SetRun(0); gSystem->Load("libFMDutil.so"); AliFMDDisplay* d = new AliFMDDisplay; diff --git a/FMD/scripts/DisplayESD.C b/FMD/scripts/DisplayESD.C index a79fd6ef152..16269fc72cc 100644 --- a/FMD/scripts/DisplayESD.C +++ b/FMD/scripts/DisplayESD.C @@ -11,7 +11,7 @@ void DisplayESD() { AliCDBManager* cdb = AliCDBManager::Instance(); - cdb->SetDefaultStorage("local://$ALICE_ROOT"); + cdb->SetDefaultStorage("local://$ALICE_ROOT/OCDB"); gSystem->Load("libFMDutil.so"); AliFMDDisplay* d = new AliFMDDisplay; d->AddLoad(AliFMDInput::kESD); diff --git a/FMD/scripts/DisplayHits.C b/FMD/scripts/DisplayHits.C index e107c7570c0..987b45e7e7d 100644 --- a/FMD/scripts/DisplayHits.C +++ b/FMD/scripts/DisplayHits.C @@ -11,7 +11,7 @@ void DisplayHits() { AliCDBManager* cdb = AliCDBManager::Instance(); - cdb->SetDefaultStorage("local://$ALICE_ROOT"); + cdb->SetDefaultStorage("local://$ALICE_ROOT/OCDB"); gSystem->Load("libFMDutil.so"); AliFMDDisplay* d = new AliFMDDisplay; d->AddLoad(AliFMDInput::kHits); diff --git a/FMD/scripts/DisplayRecs.C b/FMD/scripts/DisplayRecs.C index 7c61f00e54e..d9689e9c217 100644 --- a/FMD/scripts/DisplayRecs.C +++ b/FMD/scripts/DisplayRecs.C @@ -11,7 +11,7 @@ void DisplayRecs() { AliCDBManager* cdb = AliCDBManager::Instance(); - cdb->SetDefaultStorage("local://$ALICE_ROOT"); + cdb->SetDefaultStorage("local://$ALICE_ROOT/OCDB"); gSystem->Load("libFMDutil.so"); AliFMDDisplay* d = new AliFMDDisplay; d->AddLoad(AliFMDInput::kRecPoints); diff --git a/FMD/scripts/ESDDataSize.C b/FMD/scripts/ESDDataSize.C index 9527f0a2561..9eae0267f66 100644 --- a/FMD/scripts/ESDDataSize.C +++ b/FMD/scripts/ESDDataSize.C @@ -2,7 +2,7 @@ void FillEtas(AliFMDFloatMap& etas) { AliCDBManager* cdb = AliCDBManager::Instance(); - cdb->SetDefaultStorage("local://$ALICE_ROOT"); + cdb->SetDefaultStorage("local://$ALICE_ROOT/OCDB"); cdb->SetRun(0); AliGeomManager::LoadGeometry("geometry.root"); AliFMDGeometry* geom = AliFMDGeometry::Instance(); diff --git a/FMD/scripts/FancyDigits.C b/FMD/scripts/FancyDigits.C index 27cea2feafd..2bbe3e767d0 100644 --- a/FMD/scripts/FancyDigits.C +++ b/FMD/scripts/FancyDigits.C @@ -11,7 +11,7 @@ void FancyDigits() { AliCDBManager* cdb = AliCDBManager::Instance(); - cdb->SetDefaultStorage("local://$ALICE_ROOT"); + cdb->SetDefaultStorage("local://$ALICE_ROOT/OCDB"); gSystem->Load("libFMDutil.so"); AliFMDFancy* d = new AliFMDFancy; d->AddLoad(AliFMDInput::kDigits); diff --git a/FMD/scripts/FancyHits.C b/FMD/scripts/FancyHits.C index d7f880d82a5..8acb5fe1f3f 100644 --- a/FMD/scripts/FancyHits.C +++ b/FMD/scripts/FancyHits.C @@ -11,7 +11,7 @@ void FancyHits() { AliCDBManager* cdb = AliCDBManager::Instance(); - cdb->SetDefaultStorage("local://$ALICE_ROOT"); + cdb->SetDefaultStorage("local://$ALICE_ROOT/OCDB"); gSystem->Load("libFMDutil.so"); AliFMDFancy* d = new AliFMDFancy; d->AddLoad(AliFMDInput::kHits); diff --git a/FMD/scripts/FullMapping.C b/FMD/scripts/FullMapping.C index a4b408c430e..81014b13c0c 100644 --- a/FMD/scripts/FullMapping.C +++ b/FMD/scripts/FullMapping.C @@ -7,7 +7,7 @@ FullMapping() AliCDBManager* cdb = AliCDBManager::Instance(); AliFMDParameters* param = AliFMDParameters::Instance(); AliFMDGeometry* geom = AliFMDGeometry::Instance(); - cdb->SetDefaultStorage("local://$ALICE_ROOT"); + cdb->SetDefaultStorage("local://$ALICE_ROOT/OCDB"); cdb->SetRun(0); param->Init(); geom->Init(); diff --git a/FMD/scripts/Hits2Digits.C b/FMD/scripts/Hits2Digits.C index f3125eb9287..47bd5169cdb 100644 --- a/FMD/scripts/Hits2Digits.C +++ b/FMD/scripts/Hits2Digits.C @@ -30,7 +30,7 @@ Hits2Digits() TTree* treeE = runLoader->TreeE(); AliCDBManager::Instance()->SetRun(0); - AliCDBManager::Instance()->SetDefaultStorage("local://$ALICE_ROOT"); + AliCDBManager::Instance()->SetDefaultStorage("local://$ALICE_ROOT/OCDB"); fmd->Hits2Digits(); } diff --git a/FMD/scripts/Hits2SDigits.C b/FMD/scripts/Hits2SDigits.C index 3a13ae18cec..898d929209a 100644 --- a/FMD/scripts/Hits2SDigits.C +++ b/FMD/scripts/Hits2SDigits.C @@ -1,7 +1,7 @@ void Hits2SDigits() { - AliCDBManager::Instance()->SetDefaultStorage("local://$ALICE_ROOT"); + AliCDBManager::Instance()->SetDefaultStorage("local://$ALICE_ROOT/OCDB"); AliCDBManager::Instance()->SetRun(0); AliRunLoader* runLoader = AliRunLoader::Open("galice.root", "Alice", "read"); diff --git a/FMD/scripts/MakeAlignment.C b/FMD/scripts/MakeAlignment.C index d779daea78e..5937efeae9d 100644 --- a/FMD/scripts/MakeAlignment.C +++ b/FMD/scripts/MakeAlignment.C @@ -14,7 +14,7 @@ MakeAlignment() gAlice->Init("$ALICE_ROOT/FMD/Config.C"); AliCDBManager* cdb = AliCDBManager::Instance(); if(!cdb->IsDefaultStorageSet()) - cdb->SetDefaultStorage("local://$ALICE_ROOT"); + cdb->SetDefaultStorage("local://$ALICE_ROOT/OCDB"); cdb->SetRun(0); AliLog::SetModuleDebugLevel("FMD", 1); gSystem->Load("libFMDutil.so"); diff --git a/FMD/scripts/MakeCalibration.C b/FMD/scripts/MakeCalibration.C index c5dba42c5cc..b3164eaf661 100644 --- a/FMD/scripts/MakeCalibration.C +++ b/FMD/scripts/MakeCalibration.C @@ -19,7 +19,7 @@ AdcPerMip2Gain(Int_t adc) } void -MakeCalibration(const char* base="local://$ALICE_ROOT") +MakeCalibration(const char* base="local://$ALICE_ROOT/OCDB") { AliCDBManager* cdb = AliCDBManager::Instance(); cdb->SetDefaultStorage(base); diff --git a/FMD/scripts/MakeFakeDigits.C b/FMD/scripts/MakeFakeDigits.C index 9ad3c4f1bdb..57a4e03de39 100644 --- a/FMD/scripts/MakeFakeDigits.C +++ b/FMD/scripts/MakeFakeDigits.C @@ -3,7 +3,7 @@ void MakeFakeDigits() { - AliCDBManager::Instance()->SetDefaultStorage("local://$ALICE_ROOT"); + AliCDBManager::Instance()->SetDefaultStorage("local://$ALICE_ROOT/OCDB"); AliCDBManager::Instance()->SetRun(0); AliFMDParameters* param = AliFMDParameters::Instance(); param->Init(kFALSE,(AliFMDParameters::kPulseGain| diff --git a/FMD/scripts/MakeFakeHits.C b/FMD/scripts/MakeFakeHits.C index e0f2099cd0d..0ff02eb35ca 100644 --- a/FMD/scripts/MakeFakeHits.C +++ b/FMD/scripts/MakeFakeHits.C @@ -25,7 +25,7 @@ MakeFakeHits() // OCDB manager AliCDBManager* cdb = AliCDBManager::Instance(); - cdb->SetDefaultStorage("local://$ALICE_ROOT") + cdb->SetDefaultStorage("local://$ALICE_ROOT/OCDB") cdb->SetRunNumber(0) // Geometry database diff --git a/FMD/scripts/MakeResidualAlignment.C b/FMD/scripts/MakeResidualAlignment.C index 339185a4c10..ba1ff753cc2 100644 --- a/FMD/scripts/MakeResidualAlignment.C +++ b/FMD/scripts/MakeResidualAlignment.C @@ -14,7 +14,7 @@ MakeResidualAlignment() gAlice->Init("$ALICE_ROOT/FMD/Config.C"); AliCDBManager* cdb = AliCDBManager::Instance(); if(!cdb->IsDefaultStorageSet()) - cdb->SetDefaultStorage("local://$ALICE_ROOT"); + cdb->SetDefaultStorage("local://$ALICE_ROOT/OCDB"); cdb->SetRun(0); AliLog::SetModuleDebugLevel("FMD", 1); gSystem->Load("libFMDutil.so"); diff --git a/FMD/scripts/PatternDigits.C b/FMD/scripts/PatternDigits.C index 1faed8e94dd..03fb0373368 100644 --- a/FMD/scripts/PatternDigits.C +++ b/FMD/scripts/PatternDigits.C @@ -12,7 +12,7 @@ PatternDigits() { AliLog::SetModuleDebugLevel("FMD", 1); AliCDBManager* cdb = AliCDBManager::Instance(); - cdb->SetDefaultStorage("local://$ALICE_ROOT"); + cdb->SetDefaultStorage("local://$ALICE_ROOT/OCDB"); cdb->SetRun(0); AliFMDParameters::Instance()->Init(); gSystem->Load("libFMDutil.so"); diff --git a/FMD/scripts/PatternESD.C b/FMD/scripts/PatternESD.C index d5ab325f044..921464884e5 100644 --- a/FMD/scripts/PatternESD.C +++ b/FMD/scripts/PatternESD.C @@ -11,7 +11,7 @@ void PatternESD() { AliCDBManager* cdb = AliCDBManager::Instance(); - cdb->SetDefaultStorage("local://$ALICE_ROOT"); + cdb->SetDefaultStorage("local://$ALICE_ROOT/OCDB"); gSystem->Load("libFMDutil.so"); AliFMDPattern* d = new AliFMDPattern; // d->SetMultiplicityCut(0); diff --git a/FMD/scripts/PatternRaw.C b/FMD/scripts/PatternRaw.C index e40d52e439f..da8dc4e02f6 100644 --- a/FMD/scripts/PatternRaw.C +++ b/FMD/scripts/PatternRaw.C @@ -12,7 +12,7 @@ PatternRaw(const char* file="raw.root") { // AliLog::SetModuleDebugLevel("FMD", 8); AliCDBManager* cdb = AliCDBManager::Instance(); - cdb->SetDefaultStorage("local://$ALICE_ROOT"); + cdb->SetDefaultStorage("local://$ALICE_ROOT/OCDB"); cdb->SetRun(0); AliFMDParameters::Instance()->Init(); gSystem->Load("libFMDutil.so"); diff --git a/FMD/scripts/PatternRecs.C b/FMD/scripts/PatternRecs.C index 1972bd82c6c..d81314f2e0f 100644 --- a/FMD/scripts/PatternRecs.C +++ b/FMD/scripts/PatternRecs.C @@ -12,7 +12,7 @@ PatternRecs() { AliLog::SetModuleDebugLevel("FMD", 1); AliCDBManager* cdb = AliCDBManager::Instance(); - cdb->SetDefaultStorage("local://$ALICE_ROOT"); + cdb->SetDefaultStorage("local://$ALICE_ROOT/OCDB"); cdb->SetRun(0); AliFMDParameters::Instance()->Init(); gSystem->Load("libFMDutil.so"); diff --git a/FMD/scripts/PatternSDigits.C b/FMD/scripts/PatternSDigits.C index 8bc2ac2b8b1..6da3b01c9a1 100644 --- a/FMD/scripts/PatternSDigits.C +++ b/FMD/scripts/PatternSDigits.C @@ -12,7 +12,7 @@ PatternSDigits() { AliLog::SetModuleDebugLevel("FMD", 1); AliCDBManager* cdb = AliCDBManager::Instance(); - cdb->SetDefaultStorage("local://$ALICE_ROOT"); + cdb->SetDefaultStorage("local://$ALICE_ROOT/OCDB"); cdb->SetRun(0); AliFMDParameters::Instance()->Init(); gSystem->Load("libANALYSIS.so"); diff --git a/FMD/scripts/PrintAlignment.C b/FMD/scripts/PrintAlignment.C index a207166bc43..be94b65d4c8 100644 --- a/FMD/scripts/PrintAlignment.C +++ b/FMD/scripts/PrintAlignment.C @@ -13,7 +13,7 @@ void PrintAlignment() { AliCDBManager* cdb = AliCDBManager::Instance(); - cdb->SetDefaultStorage("local://$ALICE_ROOT"); + cdb->SetDefaultStorage("local://$ALICE_ROOT/OCDB"); AliCDBEntry* align = cdb->Get("FMD/Align/Data"); if (!align) { Error("PrintAlignment","didn't alignment data from CDB"); diff --git a/FMD/scripts/PrintCalibration.C b/FMD/scripts/PrintCalibration.C index a95f5185ac8..e9b9ef89fe5 100644 --- a/FMD/scripts/PrintCalibration.C +++ b/FMD/scripts/PrintCalibration.C @@ -16,7 +16,7 @@ void PrintCalibration(Int_t r=0, const char* what="gain") { AliCDBManager* cdb = AliCDBManager::Instance(); - cdb->SetDefaultStorage("local://$ALICE_ROOT"); + cdb->SetDefaultStorage("local://$ALICE_ROOT/OCDB"); cdb->SetRun(r); AliFMDParameters* p = AliFMDParameters::Instance(); p->Init(kTRUE); diff --git a/FMD/scripts/Raw2ESD.C b/FMD/scripts/Raw2ESD.C index e1d7ed69ec4..f90d9ae4fa6 100644 --- a/FMD/scripts/Raw2ESD.C +++ b/FMD/scripts/Raw2ESD.C @@ -2,7 +2,7 @@ void Raw2ESD(const char* file="") { AliCDBManager::Instance()->SetRun(0); - AliCDBManager::Instance()->SetDefaultStorage("local://$ALICE_ROOT"); + AliCDBManager::Instance()->SetDefaultStorage("local://$ALICE_ROOT/OCDB"); AliGeomManager::LoadGeometry("geometry.root"); AliRawReader* reader = 0; diff --git a/FMD/scripts/ReadRaw.C b/FMD/scripts/ReadRaw.C index 05472c69880..734767339e4 100644 --- a/FMD/scripts/ReadRaw.C +++ b/FMD/scripts/ReadRaw.C @@ -12,7 +12,7 @@ ReadRaw(const char* file=0, Int_t evno=0, bool old=false) TString src(file ? file : ""); AliCDBManager* cdb = AliCDBManager::Instance(); cdb->SetRun(0); - cdb->SetDefaultStorage("local://$ALICE_ROOT"); + cdb->SetDefaultStorage("local://$ALICE_ROOT/OCDB"); AliLog::SetModuleDebugLevel("FMD", 1); AliFMDParameters::Instance()->Init(); AliFMDParameters::Instance()->UseRcuTrailer(!old); diff --git a/FMD/scripts/SpectraMonitor.C b/FMD/scripts/SpectraMonitor.C index 8b5ba0b98cb..5748715c4f6 100644 --- a/FMD/scripts/SpectraMonitor.C +++ b/FMD/scripts/SpectraMonitor.C @@ -12,7 +12,7 @@ void SpectraMonitor(const char* file="", Int_t runno=0, - const char* cdbSrc="local://$ALICE_ROOT", + const char* cdbSrc="local://$ALICE_ROOT/OCDB", UShort_t over=0) { gSystem->Load("libANALYSIS.so"); @@ -28,7 +28,7 @@ SpectraMonitor(const char* file="", << " Is the (optional) run number\n" << " Is the (optional) CDB storage\n" << " Is the (optional) over sampling rate\n\n" - << "Defaults are =0 and cdb=\"local://$ALICE_ROOT\"\n" + << "Defaults are =0 and cdb=\"local://$ALICE_ROOT/OCDB\"\n" << " allows one to override the CDB setting. Default\n" << "is to use the CDB setting.\n\n" << "Note: This script _must_ be compiled with ACLic" @@ -696,7 +696,7 @@ public: void RunSpectraMonitor(const char* file="", Int_t runno=0, - const char* cdbSrc="local://$ALICE_ROOT", + const char* cdbSrc="local://$ALICE_ROOT/OCDB", UShort_t over=0) { // AliLog::SetModuleDebugLevel("FMD", 8); @@ -709,7 +709,7 @@ RunSpectraMonitor(const char* file="", << " Is the (optional) run number\n" << " Is the (optional) CDB storage\n" << " Is the (optional) over sampling rate\n\n" - << "Defaults are =0 and cdb=\"local://$ALICE_ROOT\"\n" + << "Defaults are =0 and cdb=\"local://$ALICE_ROOT/OCDB\"\n" << " allows one to override the CDB setting. Default\n" << "is to use the CDB setting.\n\n" << "Note: This script _must_ be compiled with ACLic" diff --git a/FMD/scripts/TestGainDA.C b/FMD/scripts/TestGainDA.C index fd779368a63..ed67e6415f3 100644 --- a/FMD/scripts/TestGainDA.C +++ b/FMD/scripts/TestGainDA.C @@ -6,7 +6,7 @@ void TestGainDA(Char_t* fileName, Int_t runNumber){ Bool_t old = kTRUE; AliCDBManager* cdb = AliCDBManager::Instance(); cdb->SetRun(runNumber); - cdb->SetDefaultStorage("local://$ALICE_ROOT"); + cdb->SetDefaultStorage("local://$ALICE_ROOT/OCDB"); AliLog::SetModuleDebugLevel("FMD", 1); AliFMDParameters::Instance()->Init(); AliFMDParameters::Instance()->UseRcuTrailer(!old); diff --git a/FMD/scripts/TestPedestalDA.C b/FMD/scripts/TestPedestalDA.C index 766bcc03a02..6d271199f71 100644 --- a/FMD/scripts/TestPedestalDA.C +++ b/FMD/scripts/TestPedestalDA.C @@ -27,7 +27,7 @@ void TestPedestalDA(Char_t* fileName="data.raw", Int_t runNumber=1, // Set-up CDB interface AliCDBManager* cdb = AliCDBManager::Instance(); cdb->SetRun(runNumber); - cdb->SetDefaultStorage("local://$ALICE_ROOT"); + cdb->SetDefaultStorage("local://$ALICE_ROOT/OCDB"); // Set debug level AliLog::SetModuleDebugLevel("FMD", 1); diff --git a/FMD/scripts/TestPreprocessor.C b/FMD/scripts/TestPreprocessor.C index 0535b72bbc7..a515451bd1a 100644 --- a/FMD/scripts/TestPreprocessor.C +++ b/FMD/scripts/TestPreprocessor.C @@ -184,13 +184,13 @@ namespace { // // Read back the calibrations written, and check the values // -void ReadBack(const char* dbBase="local://$ALICE_ROOT/FMD/") +void ReadBack(const char* dbBase="local://$ALICE_ROOT/OCDB/FMD/") { // AliLog::SetModuleDebugLevel("FMD", 1); // Set specific storage of FMD ALTRO map AliCDBManager::Instance()->SetDefaultStorage(Form("%s/TestCDB", dbBase)); AliCDBManager::Instance()->SetSpecificStorage("FMD/Calib/AltroMap", - "local://$ALICE_ROOT"); + "local://$ALICE_ROOT/OCDB"); AliCDBManager::Instance()->SetRun(0); AliFMDParameters* param = AliFMDParameters::Instance(); @@ -256,7 +256,7 @@ void ReadBack(const char* dbBase="local://$ALICE_ROOT/FMD/") // void TestPreprocessor(const char* runType="PEDESTAL", Bool_t createDummies=kTRUE, - const char* dbBase="local://$ALICE_ROOT/FMD/") + const char* dbBase="local://$ALICE_ROOT/OCDB/FMD/") { // Dummy data if (createDummies) { @@ -272,7 +272,7 @@ void TestPreprocessor(const char* runType="PEDESTAL", // create AliTestShuttle instance // The parameters are run, startTime, endTime AliTestShuttle* shuttle = new AliTestShuttle(0, 0, 1); - AliTestShuttle::SetMainCDB("local://$ALICE_ROOT/FMD/TestCDB"); + AliTestShuttle::SetMainCDB("local://$ALICE_ROOT/OCDB/FMD/TestCDB"); AliTestShuttle::SetLocalCDB(Form("%s/TestCDB", dbBase)); AliTestShuttle::SetMainRefStorage(Form("%s/TestReference", dbBase)); @@ -379,7 +379,7 @@ int main(int argc, char** argv) { Bool_t createDummies = kTRUE; - TString dbBase = "local://$ALICE_ROOT/FMD/"; + TString dbBase = "local://$ALICE_ROOT/OCDB/FMD/"; for (int i = 1; i < argc; i++) { if (argv[i][0] == '-') { switch (argv[i][1]) { diff --git a/FMD/scripts/TestRaw2SDigits.C b/FMD/scripts/TestRaw2SDigits.C index 874c70c57bd..bfd84125a53 100644 --- a/FMD/scripts/TestRaw2SDigits.C +++ b/FMD/scripts/TestRaw2SDigits.C @@ -1,7 +1,7 @@ void TestRaw2SDigits() { - AliCDBManager::Instance()->SetDefaultStorage("local://$ALICE_ROOT"); + AliCDBManager::Instance()->SetDefaultStorage("local://$ALICE_ROOT/OCDB"); AliCDBManager::Instance()->SetRun(0); AliLog::SetModuleDebugLevel("FMD", 2); AliSimulation sim; diff --git a/FMD/scripts/TestRawReader.C b/FMD/scripts/TestRawReader.C index 7d9a5be9580..379e7b3dadd 100644 --- a/FMD/scripts/TestRawReader.C +++ b/FMD/scripts/TestRawReader.C @@ -21,7 +21,7 @@ TestRawReader(const char* file= "/media/cholm_data/alice/data/08000059807016.10.root" // w/ZS ) { - AliCDBManager::Instance()->SetDefaultStorage("local://$ALICE_ROOT"); + AliCDBManager::Instance()->SetDefaultStorage("local://$ALICE_ROOT/OCDB"); AliCDBManager::Instance()->SetRun(59807); AliFMDParameters::Instance()->Init(); AliLog::SetModuleDebugLevel("FMD", 2); diff --git a/GRP/TestGRPPreprocessor.C b/GRP/TestGRPPreprocessor.C index b57d737eb3d..6aa17339912 100644 --- a/GRP/TestGRPPreprocessor.C +++ b/GRP/TestGRPPreprocessor.C @@ -23,8 +23,8 @@ void TestGRPPreprocessor() AliTestShuttle* shuttle = new AliTestShuttle(kRun, 1, 10); // by default they are set to $ALICE_ROOT/SHUTTLE/TestShuttle/TestCDB and TestReference - AliTestShuttle::SetMainCDB("local://$ALICE_ROOT/SHUTTLE/TestShuttle/TestCDB"); - AliTestShuttle::SetMainRefStorage("local://$ALICE_ROOT/SHUTTLE/TestShuttle/TestReference"); + AliTestShuttle::SetMainCDB("local://$ALICE_ROOT/OCDB/SHUTTLE/TestShuttle/TestCDB"); + AliTestShuttle::SetMainRefStorage("local://$ALICE_ROOT/OCDB/SHUTTLE/TestShuttle/TestReference"); printf("Test OCDB storage Uri: %s\n", AliShuttleInterface::GetMainCDB().Data()); printf("Test Reference storage Uri: %s\n", AliShuttleInterface::GetMainRefStorage().Data()); diff --git a/GRP/UpdateCDBCTPConfig.C b/GRP/UpdateCDBCTPConfig.C index 1bb6d3c8454..77fb9ebc874 100644 --- a/GRP/UpdateCDBCTPConfig.C +++ b/GRP/UpdateCDBCTPConfig.C @@ -7,7 +7,7 @@ void UpdateCDBCTPConfig(const char *CTPcfg, const char* cdbUri, const char* cfgF AliCDBManager* cdb = AliCDBManager::Instance(); // we set the default storage to the repository because some dets require // already at the time of geometry creation to find calibration objects in the cdb - if(!cdb->IsDefaultStorageSet()) cdb->SetDefaultStorage("local://$ALICE_ROOT"); + if(!cdb->IsDefaultStorageSet()) cdb->SetDefaultStorage("local://$ALICE_ROOT/OCDB"); AliCDBStorage* storage = cdb->GetStorage(cdbUri); cdb->SetRun(0); AliCDBId id("GRP/CTP/Config",0,AliCDBRunRange::Infinity()); diff --git a/GRP/UpdateCDBGRPEntry.C b/GRP/UpdateCDBGRPEntry.C index 1cd290c2eb3..0662ebd9286 100644 --- a/GRP/UpdateCDBGRPEntry.C +++ b/GRP/UpdateCDBGRPEntry.C @@ -2,7 +2,7 @@ void UpdateCDBGRPEntry() { // produce the GRP default entry in CDB AliCDBManager* man = AliCDBManager::Instance(); - man->SetDefaultStorage("local://$ALICE_ROOT"); + man->SetDefaultStorage("local://$ALICE_ROOT/OCDB"); man->SetRun(0); AliCDBId id("GRP/GRP/Data",0,AliCDBRunRange::Infinity()); AliCDBMetaData *metadata= new AliCDBMetaData(); diff --git a/GRP/UpdateCDBGRPEntryMC.C b/GRP/UpdateCDBGRPEntryMC.C index 0d5cb620df2..4416ca34db4 100644 --- a/GRP/UpdateCDBGRPEntryMC.C +++ b/GRP/UpdateCDBGRPEntryMC.C @@ -3,7 +3,7 @@ // reading MC parameter from Config.C AliCDBManager* man = AliCDBManager::Instance(); - man->SetDefaultStorage("local://$ALICE_ROOT"); + man->SetDefaultStorage("local://$ALICE_ROOT/OCDB"); man->SetRun(0); AliCDBId id(AliQA::GetGRPPath(), 0, AliCDBRunRange::Infinity()); AliCDBMetaData *metadata= new AliCDBMetaData(); diff --git a/GRP/UpdateCDBIdealGeom.C b/GRP/UpdateCDBIdealGeom.C index 5f65de31b27..7482fb17fc3 100644 --- a/GRP/UpdateCDBIdealGeom.C +++ b/GRP/UpdateCDBIdealGeom.C @@ -22,7 +22,7 @@ void UpdateCDBIdealGeom(const char* cdbUri, const char* cfgFile){ // we set the default storage to the repository because some dets require // already at the time of geometry creation to find calibration objects in the cdb AliCDBStorage* storage = 0; - if(!cdb->IsDefaultStorageSet()) cdb->SetDefaultStorage("local://$ALICE_ROOT"); + if(!cdb->IsDefaultStorageSet()) cdb->SetDefaultStorage("local://$ALICE_ROOT/OCDB"); storage = cdb->GetStorage(cdbUri); if(!storage) { diff --git a/GRP/UpdateCDBVertexDiamond.C b/GRP/UpdateCDBVertexDiamond.C index 25f8a7f52e7..28035a83f8b 100644 --- a/GRP/UpdateCDBVertexDiamond.C +++ b/GRP/UpdateCDBVertexDiamond.C @@ -16,7 +16,7 @@ void UpdateCDBVertexDiamond(Double_t xmed = 0., Double_t ymed = 0., Double_t sig // CDB AliCDBManager* man = AliCDBManager::Instance(); - man->SetDefaultStorage("local://$ALICE_ROOT"); + man->SetDefaultStorage("local://$ALICE_ROOT/OCDB"); man->SetRun(0); AliCDBId id("GRP/Calib/MeanVertex",0,AliCDBRunRange::Infinity()); AliCDBId idTPC("GRP/Calib/MeanVertexTPC",0,AliCDBRunRange::Infinity()); diff --git a/HLT/BASE/AliHLTMisc.h b/HLT/BASE/AliHLTMisc.h index 9247c203eee..7c38a71c697 100644 --- a/HLT/BASE/AliHLTMisc.h +++ b/HLT/BASE/AliHLTMisc.h @@ -28,7 +28,7 @@ extern "C" { * When running from AliRoot, the CDB path is set in the startup of the * reconstruction.
* If cdbpath is nil or empty and the CDB is not already initialized, the - * CDB storage is set to local://$ALICE_ROOT and the run no to 0. + * CDB storage is set to local://$ALICE_ROOT/OCDB and the run no to 0. * @param cdbpath path to the CDB * @return neg. error code if failed * @note function implemented in libHLTrec diff --git a/HLT/EMCAL/AliHLTEMCALCalibrationComponent.cxx b/HLT/EMCAL/AliHLTEMCALCalibrationComponent.cxx index 2c0fd2b0a0e..bb574061dfc 100644 --- a/HLT/EMCAL/AliHLTEMCALCalibrationComponent.cxx +++ b/HLT/EMCAL/AliHLTEMCALCalibrationComponent.cxx @@ -45,7 +45,7 @@ ClassImp(AliHLTEMCALCalibrationComponent); AliHLTEMCALCalibrationComponent::AliHLTEMCALCalibrationComponent() : AliHLTCalibrationProcessor() , fOutputPercentage(100) // By default we copy to the output exactly what we got as input - , fStrorageDBpath("local://$ALICE_ROOT") + , fStrorageDBpath("local://$ALICE_ROOT/OCDB") , fCDB(NULL) { // Default constructor diff --git a/HLT/EMCAL/AliHLTEMCALClusterizerComponent.cxx b/HLT/EMCAL/AliHLTEMCALClusterizerComponent.cxx index 4182a3a0509..273217bbf4d 100644 --- a/HLT/EMCAL/AliHLTEMCALClusterizerComponent.cxx +++ b/HLT/EMCAL/AliHLTEMCALClusterizerComponent.cxx @@ -45,7 +45,7 @@ ClassImp(AliHLTEMCALClusterizerComponent) AliHLTEMCALClusterizerComponent::AliHLTEMCALClusterizerComponent() : AliHLTProcessor() , fOutputPercentage(100) - , fStorageDBpath("local://$ALICE_ROOT") + , fStorageDBpath("local://$ALICE_ROOT/OCDB") , fCDB(NULL) , fGeometryFileName("") { @@ -59,7 +59,7 @@ AliHLTEMCALClusterizerComponent::AliHLTEMCALClusterizerComponent() AliHLTEMCALClusterizerComponent::AliHLTEMCALClusterizerComponent(const AliHLTEMCALClusterizerComponent &/*c*/) : AliHLTProcessor() , fOutputPercentage(100) - , fStorageDBpath("local://$ALICE_ROOT") + , fStorageDBpath("local://$ALICE_ROOT/OCDB") , fCDB(NULL) , fGeometryFileName("") { diff --git a/HLT/EMCAL/AliHLTEMCALTrackerComponent.cxx b/HLT/EMCAL/AliHLTEMCALTrackerComponent.cxx index 38518fec5ac..f23fa9b55f0 100644 --- a/HLT/EMCAL/AliHLTEMCALTrackerComponent.cxx +++ b/HLT/EMCAL/AliHLTEMCALTrackerComponent.cxx @@ -46,7 +46,7 @@ ClassImp(AliHLTEMCALTrackerComponent) AliHLTEMCALTrackerComponent::AliHLTEMCALTrackerComponent() : AliHLTProcessor() , fOutputPercentage(100) - , fStorageDBpath("local://$ALICE_ROOT") + , fStorageDBpath("local://$ALICE_ROOT/OCDB") , fCDB(NULL) , fGeometryFileName("") { @@ -60,7 +60,7 @@ AliHLTEMCALTrackerComponent::AliHLTEMCALTrackerComponent() AliHLTEMCALTrackerComponent::AliHLTEMCALTrackerComponent(const AliHLTEMCALTrackerComponent &/*c*/) : AliHLTProcessor() , fOutputPercentage(100) - , fStorageDBpath("local://$ALICE_ROOT") + , fStorageDBpath("local://$ALICE_ROOT/OCDB") , fCDB(NULL) , fGeometryFileName("") { diff --git a/HLT/MUON/AliHLTMUONProcessor.cxx b/HLT/MUON/AliHLTMUONProcessor.cxx index 051a825e51f..5c34fc6451f 100644 --- a/HLT/MUON/AliHLTMUONProcessor.cxx +++ b/HLT/MUON/AliHLTMUONProcessor.cxx @@ -212,7 +212,7 @@ int AliHLTMUONProcessor::SetCDBPathAndRunNo( /// Sets the CDB path and run number to read from. /// \param cdbPath The CDB path to use. If set to NULL and the path has /// not been set in the CDB manager then the default path - /// "local://$ALICE_ROOT" is used if the 'useDefault' flag is also true. + /// "local://$ALICE_ROOT/OCDB" is used if the 'useDefault' flag is also true. /// \param run The run number to use. If set to -1 and the run number has /// not been set in the CDB manager then a value of zero is used if /// the 'useDefault' flag is also true. @@ -222,7 +222,7 @@ int AliHLTMUONProcessor::SetCDBPathAndRunNo( /// \return Zero if the object could be loaded. Otherwise an error code, /// compatible with the HLT framework, is returned. - const char* defaultPath = "local://$ALICE_ROOT"; + const char* defaultPath = "local://$ALICE_ROOT/OCDB"; Int_t defaultRun = 0; AliCDBManager* cdbManager = AliCDBManager::Instance(); diff --git a/HLT/MUON/AliHLTMUONProcessor.h b/HLT/MUON/AliHLTMUONProcessor.h index 77b0a4df183..97125a1d2ac 100644 --- a/HLT/MUON/AliHLTMUONProcessor.h +++ b/HLT/MUON/AliHLTMUONProcessor.h @@ -208,7 +208,7 @@ protected: * Sets the CDB path and run number to read from. * \param cdbPath The CDB path to use. If set to NULL and the path has * not been set in the CDB manager then the default path - * "local://$ALICE_ROOT" is used if the 'useDefault' flag is also true. + * "local://$ALICE_ROOT/OCDB" is used if the 'useDefault' flag is also true. * \param run The run number to use. If set to -1 and the run number has * not been set in the CDB manager then a value of zero is used if * the 'useDefault' flag is also true. diff --git a/HLT/MUON/macros/CreateDefaultCDBEntries.C b/HLT/MUON/macros/CreateDefaultCDBEntries.C index f74aa9f8dd8..9040becb556 100644 --- a/HLT/MUON/macros/CreateDefaultCDBEntries.C +++ b/HLT/MUON/macros/CreateDefaultCDBEntries.C @@ -51,7 +51,7 @@ using std::endl; * Generates default CDB entries in the given CDB storage (local by default) * \param cdbPath The path to the local storage. */ -void CreateDefaultCDBEntries(const char* cdbPath = "local://$ALICE_ROOT") +void CreateDefaultCDBEntries(const char* cdbPath = "local://$ALICE_ROOT/OCDB") { // Setup the CDB default storage and run number. AliCDBManager* cdbManager = AliCDBManager::Instance(); diff --git a/HLT/MUON/macros/CreateHitRecoLookupTables.C b/HLT/MUON/macros/CreateHitRecoLookupTables.C index 70a178adc9a..f0f0bf335e6 100644 --- a/HLT/MUON/macros/CreateHitRecoLookupTables.C +++ b/HLT/MUON/macros/CreateHitRecoLookupTables.C @@ -75,10 +75,10 @@ This also makes this macro much cleaner. * Generates the ASCII lookup tables for the AliHLTMUONHitReconstructorComponent * components. The tables are generated from the CDB database information. * \param CDBPath This is the CDB path to use as the DB storage. - * (Default = local://$ALICE_ROOT) + * (Default = local://$ALICE_ROOT/OCDB) * \param run This is the run number to use for the CDB (Default = 0). */ -void CreateHitRecoLookupTables(const char* CDBPath = "local://$ALICE_ROOT", Int_t run = 0) +void CreateHitRecoLookupTables(const char* CDBPath = "local://$ALICE_ROOT/OCDB", Int_t run = 0) { gSystem->Load("libAliHLTMUON.so"); diff --git a/HLT/MUON/macros/CreateTriggerRecoLookupTables.C b/HLT/MUON/macros/CreateTriggerRecoLookupTables.C index 4c3e822d9c2..cd7ce0d733b 100644 --- a/HLT/MUON/macros/CreateTriggerRecoLookupTables.C +++ b/HLT/MUON/macros/CreateTriggerRecoLookupTables.C @@ -51,13 +51,13 @@ * Generates the lookup tables for the AliHLTMUONTriggerReconstructorComponent * components. The tables are generated from the CDB database information. * \param CDBPath This is the CDB path to use as the DB storage. - * (Default = local://$ALICE_ROOT) + * (Default = local://$ALICE_ROOT/OCDB) * \param run This is the run number to use for the CDB (Default = 0). * \param useCrateId Indicates if the crate ID should be used for the lookup table * indexing rather than just a sequencial number (Default = true). */ void CreateTriggerRecoLookupTables( - const char* CDBPath = "local://$ALICE_ROOT", + const char* CDBPath = "local://$ALICE_ROOT/OCDB", Int_t run = 0, bool useCrateId = true ) diff --git a/HLT/MUON/macros/MakeHitsTable.C b/HLT/MUON/macros/MakeHitsTable.C index f53c0e7bbf8..7fdb865af27 100644 --- a/HLT/MUON/macros/MakeHitsTable.C +++ b/HLT/MUON/macros/MakeHitsTable.C @@ -73,7 +73,7 @@ void MakeHitsTable( } if (cdbManager->GetDefaultStorage() == NULL) { - cdbManager->SetDefaultStorage("local://$ALICE_ROOT"); + cdbManager->SetDefaultStorage("local://$ALICE_ROOT/OCDB"); } if (cdbManager->GetRun() == -1) { diff --git a/HLT/MUON/macros/MakeTrackTable.C b/HLT/MUON/macros/MakeTrackTable.C index df74a44b4c2..39183a2e562 100644 --- a/HLT/MUON/macros/MakeTrackTable.C +++ b/HLT/MUON/macros/MakeTrackTable.C @@ -73,7 +73,7 @@ void MakeTrackTable( } if (cdbManager->GetDefaultStorage() == NULL) { - cdbManager->SetDefaultStorage("local://$ALICE_ROOT"); + cdbManager->SetDefaultStorage("local://$ALICE_ROOT/OCDB"); } if (cdbManager->GetRun() == -1) { diff --git a/HLT/MUON/macros/MakeTriggerTable.C b/HLT/MUON/macros/MakeTriggerTable.C index c5df28161a2..1ae81dbc42c 100644 --- a/HLT/MUON/macros/MakeTriggerTable.C +++ b/HLT/MUON/macros/MakeTriggerTable.C @@ -69,7 +69,7 @@ void MakeTriggerTable( } if (cdbManager->GetDefaultStorage() == NULL) { - cdbManager->SetDefaultStorage("local://$ALICE_ROOT"); + cdbManager->SetDefaultStorage("local://$ALICE_ROOT/OCDB"); } if (cdbManager->GetRun() == -1) { diff --git a/HLT/MUON/macros/RunChain.C b/HLT/MUON/macros/RunChain.C index 49f099982a8..cacb2428034 100644 --- a/HLT/MUON/macros/RunChain.C +++ b/HLT/MUON/macros/RunChain.C @@ -128,7 +128,7 @@ void RunChain( } if (cdbManager->GetDefaultStorage() == NULL) { - cdbManager->SetDefaultStorage("local://$ALICE_ROOT"); + cdbManager->SetDefaultStorage("local://$ALICE_ROOT/OCDB"); } if (cdbManager->GetRun() == -1) { @@ -397,16 +397,16 @@ void RunChain( { if (TString(lutDir) == "CDB") { - AliHLTConfiguration recDDL13("recDDL13", "MUONHitReconstructor", "pubDDL13", TString("-ddl 13 -cdbpath local://$ALICE_ROOT -run 0")); - AliHLTConfiguration recDDL14("recDDL14", "MUONHitReconstructor", "pubDDL14", TString("-ddl 14 -cdbpath local://$ALICE_ROOT -run 0")); - AliHLTConfiguration recDDL15("recDDL15", "MUONHitReconstructor", "pubDDL15", TString("-ddl 15 -cdbpath local://$ALICE_ROOT -run 0")); - AliHLTConfiguration recDDL16("recDDL16", "MUONHitReconstructor", "pubDDL16", TString("-ddl 16 -cdbpath local://$ALICE_ROOT -run 0")); - AliHLTConfiguration recDDL17("recDDL17", "MUONHitReconstructor", "pubDDL17", TString("-ddl 17 -cdbpath local://$ALICE_ROOT -run 0")); - AliHLTConfiguration recDDL18("recDDL18", "MUONHitReconstructor", "pubDDL18", TString("-ddl 18 -cdbpath local://$ALICE_ROOT -run 0")); - AliHLTConfiguration recDDL19("recDDL19", "MUONHitReconstructor", "pubDDL19", TString("-ddl 19 -cdbpath local://$ALICE_ROOT -run 0")); - AliHLTConfiguration recDDL20("recDDL20", "MUONHitReconstructor", "pubDDL20", TString("-ddl 20 -cdbpath local://$ALICE_ROOT -run 0")); - AliHLTConfiguration recDDL21("recDDL21", "MUONTriggerReconstructor", "pubDDL21", TString("-ddl 21 -cdbpath local://$ALICE_ROOT -run 0 -suppress_partial_triggers")); - AliHLTConfiguration recDDL22("recDDL22", "MUONTriggerReconstructor", "pubDDL22", TString("-ddl 22 -cdbpath local://$ALICE_ROOT -run 0 -suppress_partial_triggers")); + AliHLTConfiguration recDDL13("recDDL13", "MUONHitReconstructor", "pubDDL13", TString("-ddl 13 -cdbpath local://$ALICE_ROOT/OCDB -run 0")); + AliHLTConfiguration recDDL14("recDDL14", "MUONHitReconstructor", "pubDDL14", TString("-ddl 14 -cdbpath local://$ALICE_ROOT/OCDB -run 0")); + AliHLTConfiguration recDDL15("recDDL15", "MUONHitReconstructor", "pubDDL15", TString("-ddl 15 -cdbpath local://$ALICE_ROOT/OCDB -run 0")); + AliHLTConfiguration recDDL16("recDDL16", "MUONHitReconstructor", "pubDDL16", TString("-ddl 16 -cdbpath local://$ALICE_ROOT/OCDB -run 0")); + AliHLTConfiguration recDDL17("recDDL17", "MUONHitReconstructor", "pubDDL17", TString("-ddl 17 -cdbpath local://$ALICE_ROOT/OCDB -run 0")); + AliHLTConfiguration recDDL18("recDDL18", "MUONHitReconstructor", "pubDDL18", TString("-ddl 18 -cdbpath local://$ALICE_ROOT/OCDB -run 0")); + AliHLTConfiguration recDDL19("recDDL19", "MUONHitReconstructor", "pubDDL19", TString("-ddl 19 -cdbpath local://$ALICE_ROOT/OCDB -run 0")); + AliHLTConfiguration recDDL20("recDDL20", "MUONHitReconstructor", "pubDDL20", TString("-ddl 20 -cdbpath local://$ALICE_ROOT/OCDB -run 0")); + AliHLTConfiguration recDDL21("recDDL21", "MUONTriggerReconstructor", "pubDDL21", TString("-ddl 21 -cdbpath local://$ALICE_ROOT/OCDB -run 0 -suppress_partial_triggers")); + AliHLTConfiguration recDDL22("recDDL22", "MUONTriggerReconstructor", "pubDDL22", TString("-ddl 22 -cdbpath local://$ALICE_ROOT/OCDB -run 0 -suppress_partial_triggers")); } else { diff --git a/HLT/MUON/macros/rootlogon.C b/HLT/MUON/macros/rootlogon.C index 1abdf8bf061..7f449559542 100644 --- a/HLT/MUON/macros/rootlogon.C +++ b/HLT/MUON/macros/rootlogon.C @@ -66,7 +66,7 @@ } if (cdbManager->GetDefaultStorage() == NULL) { - cdbManager->SetDefaultStorage("local://$ALICE_ROOT"); + cdbManager->SetDefaultStorage("local://$ALICE_ROOT/OCDB"); } if (cdbManager->GetRun() == -1) { diff --git a/HLT/MUON/utils/dHLTdumpraw.cxx b/HLT/MUON/utils/dHLTdumpraw.cxx index 2f21d1f5f1e..ce323ce09ad 100644 --- a/HLT/MUON/utils/dHLTdumpraw.cxx +++ b/HLT/MUON/utils/dHLTdumpraw.cxx @@ -2379,7 +2379,7 @@ const char* TryDecodeDataSpec(const char* filename) namespace { // CDB path and run number to use. - const char* gCDBPath = "local://$ALICE_ROOT"; + const char* gCDBPath = "local://$ALICE_ROOT/OCDB"; Int_t gRunNumber = 0; } diff --git a/HLT/MUON/utils/dHLTrootify.cxx b/HLT/MUON/utils/dHLTrootify.cxx index ad8ee220338..1cd5c342031 100644 --- a/HLT/MUON/utils/dHLTrootify.cxx +++ b/HLT/MUON/utils/dHLTrootify.cxx @@ -53,7 +53,7 @@ using std::endl; namespace { // CDB path and run number to use. - const char* gCDBPath = "local://$ALICE_ROOT"; + const char* gCDBPath = "local://$ALICE_ROOT/OCDB"; Int_t gRunNumber = 0; } diff --git a/HLT/TRD/AliHLTTRDCalibrationComponent.cxx b/HLT/TRD/AliHLTTRDCalibrationComponent.cxx index 80414e292ee..d3b8fd2edf3 100644 --- a/HLT/TRD/AliHLTTRDCalibrationComponent.cxx +++ b/HLT/TRD/AliHLTTRDCalibrationComponent.cxx @@ -52,7 +52,7 @@ AliHLTTRDCalibrationComponent::AliHLTTRDCalibrationComponent(): fTRDCalibraFillHisto(NULL), fUseHLTTracks(kFALSE), fOutputPercentage(100), // By default we copy to the output exactly what we got as input - fStrorageDBpath("local://$ALICE_ROOT"), + fStrorageDBpath("local://$ALICE_ROOT/OCDB"), fCDB(NULL) { // Default constructor diff --git a/HLT/TRD/AliHLTTRDClusterizerComponent.cxx b/HLT/TRD/AliHLTTRDClusterizerComponent.cxx index eb67f03ef83..38e8944cb8c 100644 --- a/HLT/TRD/AliHLTTRDClusterizerComponent.cxx +++ b/HLT/TRD/AliHLTTRDClusterizerComponent.cxx @@ -65,7 +65,7 @@ ClassImp(AliHLTTRDClusterizerComponent); AliHLTTRDClusterizerComponent::AliHLTTRDClusterizerComponent(): AliHLTProcessor(), fOutputPercentage(100), // By default we copy to the output exactly what we got as input - fStrorageDBpath("local://$ALICE_ROOT"), + fStrorageDBpath("local://$ALICE_ROOT/OCDB"), fClusterizer(NULL), fRecoParam(NULL), fCDB(NULL), diff --git a/HLT/TRD/AliHLTTRDTrackerComponent.cxx b/HLT/TRD/AliHLTTRDTrackerComponent.cxx index 570e107d528..8f17832114e 100644 --- a/HLT/TRD/AliHLTTRDTrackerComponent.cxx +++ b/HLT/TRD/AliHLTTRDTrackerComponent.cxx @@ -53,7 +53,7 @@ ClassImp(AliHLTTRDTrackerComponent); AliHLTTRDTrackerComponent::AliHLTTRDTrackerComponent() : AliHLTProcessor() , fOutputPercentage(100) // By default we copy to the output exactly what we got as input - , fStrorageDBpath("local://$ALICE_ROOT") + , fStrorageDBpath("local://$ALICE_ROOT/OCDB") , fCDB(NULL) , fGeometryFileName("") , fGeometryFile(NULL) diff --git a/HLT/TRD/AliHLTTRDTrackerV1Component.cxx b/HLT/TRD/AliHLTTRDTrackerV1Component.cxx index 204fba649fd..8296912930f 100644 --- a/HLT/TRD/AliHLTTRDTrackerV1Component.cxx +++ b/HLT/TRD/AliHLTTRDTrackerV1Component.cxx @@ -60,7 +60,7 @@ ClassImp(AliHLTTRDTrackerV1Component); AliHLTTRDTrackerV1Component::AliHLTTRDTrackerV1Component(): AliHLTProcessor(), fOutputPercentage(100), // By default we copy to the output exactly what we got as input - fStrorageDBpath("local://$ALICE_ROOT"), + fStrorageDBpath("local://$ALICE_ROOT/OCDB"), fCDB(NULL), fGeometryFileName(""), fUseHLTClusters(kFALSE), diff --git a/HLT/rec/AliHLTMisc.cxx b/HLT/rec/AliHLTMisc.cxx index f419acb460d..5d002c5d223 100644 --- a/HLT/rec/AliHLTMisc.cxx +++ b/HLT/rec/AliHLTMisc.cxx @@ -38,7 +38,7 @@ int AliHLTMiscInitCDB(const char* cdbpath) pCDB->SetDefaultStorage(cdbpath); log.Logging(kHLTLogDebug, "InitCDB", "CDB handling", "CDB instance 0x%x", pCDB); } else if (!pCDB->IsDefaultStorageSet()) { - const char* cdbUri="local://$ALICE_ROOT"; + const char* cdbUri="local://$ALICE_ROOT/OCDB"; pCDB->SetDefaultStorage(cdbUri); pCDB->SetRun(0); log.Logging(kHLTLogInfo, "InitCDB", "CDB handling", "set default URI: %s", cdbUri); diff --git a/HMPID/Hshuttle.C b/HMPID/Hshuttle.C index 7ad04c4fc59..03befe40d6a 100644 --- a/HMPID/Hshuttle.C +++ b/HMPID/Hshuttle.C @@ -3,7 +3,7 @@ void Hshuttle(Int_t runTime=1500) gSystem->Load("$ALICE_ROOT/SHUTTLE/TestShuttle/libTestShuttle.so"); // AliTestShuttle::SetMainCDB(TString("local://$HOME/CDB")); // AliTestShuttle::SetMainCDB(TString("local://$HOME")); - AliTestShuttle::SetMainCDB(TString("local://$ALICE_ROOT")); + AliTestShuttle::SetMainCDB(TString("local://$ALICE_ROOT/OCDB")); TMap *pDcsMap = new TMap; pDcsMap->SetOwner(1); //DCS archive map diff --git a/HMPID/MakeHMPIDFullMisAlignment.C b/HMPID/MakeHMPIDFullMisAlignment.C index 2d0dca26274..577d02f66aa 100644 --- a/HMPID/MakeHMPIDFullMisAlignment.C +++ b/HMPID/MakeHMPIDFullMisAlignment.C @@ -4,7 +4,7 @@ void MakeHMPIDFullMisAlignment(){ const char* macroname = "MakeHMPIDFullMisAlignment.C"; // Activate CDB storage and load geometry from CDB AliCDBManager* cdb = AliCDBManager::Instance(); - if(!cdb->IsDefaultStorageSet()) cdb->SetDefaultStorage("local://$ALICE_ROOT"); + if(!cdb->IsDefaultStorageSet()) cdb->SetDefaultStorage("local://$ALICE_ROOT/OCDB"); cdb->SetRun(0); AliCDBStorage* storage; diff --git a/HMPID/MakeHMPIDResMisAlignment.C b/HMPID/MakeHMPIDResMisAlignment.C index 20b5e6f4989..b1ad9cbfbc6 100644 --- a/HMPID/MakeHMPIDResMisAlignment.C +++ b/HMPID/MakeHMPIDResMisAlignment.C @@ -4,7 +4,7 @@ void MakeHMPIDResMisAlignment(){ const char* macroname = "MakeHMPIDResMisAlignment.C"; // Activate CDB storage and load geometry from CDB AliCDBManager* cdb = AliCDBManager::Instance(); - if(!cdb->IsDefaultStorageSet()) cdb->SetDefaultStorage("local://$ALICE_ROOT"); + if(!cdb->IsDefaultStorageSet()) cdb->SetDefaultStorage("local://$ALICE_ROOT/OCDB"); cdb->SetRun(0); AliCDBStorage* storage; diff --git a/HMPID/MakeHMPIDZeroMisAlignment.C b/HMPID/MakeHMPIDZeroMisAlignment.C index 1f7306b1528..eca45566b79 100644 --- a/HMPID/MakeHMPIDZeroMisAlignment.C +++ b/HMPID/MakeHMPIDZeroMisAlignment.C @@ -4,7 +4,7 @@ void MakeHMPIDZeroMisAlignment(){ const char* macroname = "MakeHMPIDZeroMisAlignment.C"; // Activate CDB storage and load geometry from CDB AliCDBManager* cdb = AliCDBManager::Instance(); - if(!cdb->IsDefaultStorageSet()) cdb->SetDefaultStorage("local://$ALICE_ROOT"); + if(!cdb->IsDefaultStorageSet()) cdb->SetDefaultStorage("local://$ALICE_ROOT/OCDB"); cdb->SetRun(0); AliCDBStorage* storage; diff --git a/HMPID/SurveyToAlignHmpid.C b/HMPID/SurveyToAlignHmpid.C index 975b2ebae8d..a7715f3e207 100644 --- a/HMPID/SurveyToAlignHmpid.C +++ b/HMPID/SurveyToAlignHmpid.C @@ -22,9 +22,9 @@ void SurveyToAlignHmpid(const char* filename="Survey_781282_HMPID.txt"){ // We retrieve and open the ideal geometry AliCDBManager* cdbman = AliCDBManager::Instance(); if(!cdbman->IsDefaultStorageSet()){ - cdbman->SetDefaultStorage("local://$ALICE_ROOT"); + cdbman->SetDefaultStorage("local://$ALICE_ROOT/OCDB"); }else{ - cdbman->SetSpecificStorage("GRP/Geometry/*","local://$ALICE_ROOT"); + cdbman->SetSpecificStorage("GRP/Geometry/*","local://$ALICE_ROOT/OCDB"); } cdbman->SetRun(0); AliCDBEntry* cdbe = (AliCDBEntry*) cdbman->Get("GRP/Geometry/Data"); diff --git a/ITS/AliITSAnalizeSPDHits.C b/ITS/AliITSAnalizeSPDHits.C index 2a58126cda5..f5c5cf07e74 100644 --- a/ITS/AliITSAnalizeSPDHits.C +++ b/ITS/AliITSAnalizeSPDHits.C @@ -18,7 +18,7 @@ void AliITSAnalizeSPDHits(TString hfn="galice.root",Int_t mod=-1, AliCDBManager* man = AliCDBManager::Instance(); if (!man->IsDefaultStorageSet()) { printf("Setting a local default storage and run number 0\n"); - man->SetDefaultStorage("local://$ALICE_ROOT"); + man->SetDefaultStorage("local://$ALICE_ROOT/OCDB"); man->SetRun(0); }else { printf("Using deafult storage \n"); diff --git a/ITS/AliITSDCSAnalyzerSDD.cxx b/ITS/AliITSDCSAnalyzerSDD.cxx index fb27fad06e4..d128d4bbdad 100644 --- a/ITS/AliITSDCSAnalyzerSDD.cxx +++ b/ITS/AliITSDCSAnalyzerSDD.cxx @@ -13,7 +13,7 @@ * provided "as is" without express or implied warranty. * **************************************************************************/ -/* $Id:$ */ +/* $Id$ */ /////////////////////////////////////////////////////////////////// // Implementation of the class for SDD DCS data analysis // diff --git a/ITS/AliITSDetTypeSim.cxx b/ITS/AliITSDetTypeSim.cxx index 31427a19d04..d9bfa247429 100644 --- a/ITS/AliITSDetTypeSim.cxx +++ b/ITS/AliITSDetTypeSim.cxx @@ -849,7 +849,7 @@ void AliITSDetTypeSim::StoreCalibration(Int_t firstRun, Int_t lastRun, if(!AliCDBManager::Instance()->IsDefaultStorageSet()) { AliWarning("No storage set! Will use dummy one"); - AliCDBManager::Instance()->SetDefaultStorage("local://$ALICE_ROOT"); + AliCDBManager::Instance()->SetDefaultStorage("local://$ALICE_ROOT/OCDB"); } if (!fCalibration) { diff --git a/ITS/AliITSFastOrCalibrationSPD.cxx b/ITS/AliITSFastOrCalibrationSPD.cxx index 35db352a03f..fc25c5bc386 100644 --- a/ITS/AliITSFastOrCalibrationSPD.cxx +++ b/ITS/AliITSFastOrCalibrationSPD.cxx @@ -42,7 +42,7 @@ Bool_t AliITSFastOrCalibrationSPD::WriteFOConfToDB(Int_t runNrStart, Int_t runNr AliCDBManager* man = AliCDBManager::Instance(); if(!man->IsDefaultStorageSet()) { - man->SetDefaultStorage("local://$ALICE_ROOT"); + man->SetDefaultStorage("local://$ALICE_ROOT/OCDB"); } AliCDBMetaData* metaData = new AliCDBMetaData(); diff --git a/ITS/AliITSFindClustersV2.C b/ITS/AliITSFindClustersV2.C index b601b7273d2..e8cba5ad628 100644 --- a/ITS/AliITSFindClustersV2.C +++ b/ITS/AliITSFindClustersV2.C @@ -61,7 +61,7 @@ Int_t AliITSFindClustersV2(char *inputRawData = NULL,TString filename="galice.ro AliCDBManager* man = AliCDBManager::Instance(); if (!man->IsDefaultStorageSet()) { printf("Setting a local default storage and run number 0\n"); - man->SetDefaultStorage("local://$ALICE_ROOT"); + man->SetDefaultStorage("local://$ALICE_ROOT/OCDB"); man->SetRun(0); } else { diff --git a/ITS/AliITSGeoPlot.C b/ITS/AliITSGeoPlot.C index 3dd1fca5a8b..ecf9def8052 100644 --- a/ITS/AliITSGeoPlot.C +++ b/ITS/AliITSGeoPlot.C @@ -110,7 +110,7 @@ Int_t AliITSGeoPlot (Int_t evesel=0, char *opt="All+ClustersV2", TString filenam AliCDBManager* man = AliCDBManager::Instance(); if (!man->IsDefaultStorageSet()) { printf("Setting a local default storage and run number 0\n"); - man->SetDefaultStorage("local://$ALICE_ROOT"); + man->SetDefaultStorage("local://$ALICE_ROOT/OCDB"); man->SetRun(0); } else { diff --git a/ITS/AliITSOnlineCalibrationSPDhandler.cxx b/ITS/AliITSOnlineCalibrationSPDhandler.cxx index b3bc65a28c1..870dcbd81b4 100644 --- a/ITS/AliITSOnlineCalibrationSPDhandler.cxx +++ b/ITS/AliITSOnlineCalibrationSPDhandler.cxx @@ -511,7 +511,7 @@ Bool_t AliITSOnlineCalibrationSPDhandler::ReadDeadModuleFromDB(UInt_t module, In TString storageSTR = Form("%s",storage); if (storageSTR.CompareTo("default")==0) { if(!man->IsDefaultStorageSet()) { - man->SetDefaultStorage("local://$ALICE_ROOT"); + man->SetDefaultStorage("local://$ALICE_ROOT/OCDB"); } } else { @@ -564,7 +564,7 @@ Bool_t AliITSOnlineCalibrationSPDhandler::ReadNoisyModuleFromDB(UInt_t module, I TString storageSTR = Form("%s",storage); if (storageSTR.CompareTo("default")==0) { if(!man->IsDefaultStorageSet()) { - man->SetDefaultStorage("local://$ALICE_ROOT"); + man->SetDefaultStorage("local://$ALICE_ROOT/OCDB"); } } else { @@ -612,7 +612,7 @@ Bool_t AliITSOnlineCalibrationSPDhandler::ReadDeadFromDB(Int_t runNr, const Char TString storageSTR = Form("%s",storage); if (storageSTR.CompareTo("default")==0) { if(!man->IsDefaultStorageSet()) { - man->SetDefaultStorage("local://$ALICE_ROOT"); + man->SetDefaultStorage("local://$ALICE_ROOT/OCDB"); } } else { @@ -669,7 +669,7 @@ Bool_t AliITSOnlineCalibrationSPDhandler::ReadNoisyFromDB(Int_t runNr, const Cha TString storageSTR = Form("%s",storage); if (storageSTR.CompareTo("default")==0) { if(!man->IsDefaultStorageSet()) { - man->SetDefaultStorage("local://$ALICE_ROOT"); + man->SetDefaultStorage("local://$ALICE_ROOT/OCDB"); } } else { @@ -715,7 +715,7 @@ Bool_t AliITSOnlineCalibrationSPDhandler::ReadDeadFromDBasNoisy(Int_t runNr, con TString storageSTR = Form("%s",storage); if (storageSTR.CompareTo("default")==0) { if(!man->IsDefaultStorageSet()) { - man->SetDefaultStorage("local://$ALICE_ROOT"); + man->SetDefaultStorage("local://$ALICE_ROOT/OCDB"); } } else { @@ -810,7 +810,7 @@ Bool_t AliITSOnlineCalibrationSPDhandler::WriteDeadToDB(Int_t runNrStart, Int_t TString storageSTR = Form("%s",storage); if (storageSTR.CompareTo("default")==0) { if(!man->IsDefaultStorageSet()) { - man->SetDefaultStorage("local://$ALICE_ROOT"); + man->SetDefaultStorage("local://$ALICE_ROOT/OCDB"); } } else { @@ -857,7 +857,7 @@ Bool_t AliITSOnlineCalibrationSPDhandler::WriteDeadToDBasNoisy(Int_t runNrStart, TString storageSTR = Form("%s",storage); if (storageSTR.CompareTo("default")==0) { if(!man->IsDefaultStorageSet()) { - man->SetDefaultStorage("local://$ALICE_ROOT"); + man->SetDefaultStorage("local://$ALICE_ROOT/OCDB"); } } else { @@ -904,7 +904,7 @@ Bool_t AliITSOnlineCalibrationSPDhandler::WriteNoisyToDB(Int_t runNrStart, Int_t TString storageSTR = Form("%s",storage); if (storageSTR.CompareTo("default")==0) { if(!man->IsDefaultStorageSet()) { - man->SetDefaultStorage("local://$ALICE_ROOT"); + man->SetDefaultStorage("local://$ALICE_ROOT/OCDB"); } } else { diff --git a/ITS/AliITSPlaneEff.cxx b/ITS/AliITSPlaneEff.cxx index 88dd48e4da0..5871502f919 100644 --- a/ITS/AliITSPlaneEff.cxx +++ b/ITS/AliITSPlaneEff.cxx @@ -192,7 +192,7 @@ void AliITSPlaneEff::InitCDB() AliDebug(2, Form("Default CDB storage is set to: %s", fCDBUri.Data())); AliDebug(2, "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"); } else { - fCDBUri="local://$ALICE_ROOT"; + fCDBUri="local://$ALICE_ROOT/OCDB"; AliWarning("!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"); AliWarning("Default CDB storage not yet set !!!!"); AliWarning(Form("Setting it now to: %s", fCDBUri.Data())); diff --git a/ITS/AliITSPlaneEff.h b/ITS/AliITSPlaneEff.h index 9aba39c15dc..a243dd7780d 100644 --- a/ITS/AliITSPlaneEff.h +++ b/ITS/AliITSPlaneEff.h @@ -18,7 +18,7 @@ class AliITSgeom; // // //////////////////////////////////////////////////// -/* $Id:$ */ +/* $Id$ */ class AliITSPlaneEff : public AliPlaneEff { public: diff --git a/ITS/AliITSPlaneEffSDD.h b/ITS/AliITSPlaneEffSDD.h index 68008451af2..fbd7ebd2c36 100644 --- a/ITS/AliITSPlaneEffSDD.h +++ b/ITS/AliITSPlaneEffSDD.h @@ -15,7 +15,7 @@ // Origin: Giuseppe.Bruno@ba.infn.it // /////////////////////////////////////////// -/* $Id:$ */ +/* $Id$ */ class AliITSPlaneEffSDD : public AliITSPlaneEff { public: diff --git a/ITS/AliITSPlaneEffSPD.h b/ITS/AliITSPlaneEffSPD.h index b0a033e67c0..33ba77d4b85 100644 --- a/ITS/AliITSPlaneEffSPD.h +++ b/ITS/AliITSPlaneEffSPD.h @@ -15,7 +15,7 @@ // Origin: Giuseppe.Bruno@ba.infn.it // /////////////////////////////////////////// -/* $Id:$ */ +/* $Id$ */ class AliITSPlaneEffSPD : public AliITSPlaneEff { public: diff --git a/ITS/AliITSPrintRecPoints.C b/ITS/AliITSPrintRecPoints.C index 2ca2c884f98..625bfce669f 100644 --- a/ITS/AliITSPrintRecPoints.C +++ b/ITS/AliITSPrintRecPoints.C @@ -45,7 +45,7 @@ void AliITSPrintRecPoints(Int_t outtype=1,TString rfn="galice.root", AliCDBManager* man = AliCDBManager::Instance(); if (!man->IsDefaultStorageSet()) { printf("Setting a local default storage and run number 0\n"); - man->SetDefaultStorage("local://$ALICE_ROOT"); + man->SetDefaultStorage("local://$ALICE_ROOT/OCDB"); man->SetRun(0); } else { diff --git a/ITS/AliITSQASSDDataMakerRec.cxx b/ITS/AliITSQASSDDataMakerRec.cxx index 3c21e44926b..f1e03028eba 100644 --- a/ITS/AliITSQASSDDataMakerRec.cxx +++ b/ITS/AliITSQASSDDataMakerRec.cxx @@ -67,7 +67,7 @@ fCDBManager(0) { //initilize the raw signal vs strip number histograms if(fkOnline) { fCDBManager = AliCDBManager::Instance(); - //fCDBManager->SetDefaultStorage("local://$ALICE_ROOT"); + //fCDBManager->SetDefaultStorage("local://$ALICE_ROOT/OCDB"); fCDBManager->SetDefaultStorage(gSystem->Getenv("AMORE_CDB_URI")); Int_t runNumber = atoi(gSystem->Getenv("DATE_RUN_NUMBER")); if(!runNumber) diff --git a/ITS/AliITSSurveyToAlignSSD.cxx b/ITS/AliITSSurveyToAlignSSD.cxx index 24652d44281..1a6cdcd5be8 100644 --- a/ITS/AliITSSurveyToAlignSSD.cxx +++ b/ITS/AliITSSurveyToAlignSSD.cxx @@ -162,7 +162,7 @@ void AliITSSurveyToAlignSSD::CreateAlignObj(){ //load ideal geometry from the OCDB AliCDBManager *cdb = AliCDBManager::Instance(); - cdb->SetDefaultStorage("local://$ALICE_ROOT"); + cdb->SetDefaultStorage("local://$ALICE_ROOT/OCDB"); cdb->SetRun(fRun); AliCDBEntry* entry = cdb->Get("GRP/Geometry/Data"); AliGeomManager::SetGeometry(gGeoManager); diff --git a/ITS/AliITSspdLayer1Coverage.C b/ITS/AliITSspdLayer1Coverage.C index d02237a95fc..5da464bfaf9 100644 --- a/ITS/AliITSspdLayer1Coverage.C +++ b/ITS/AliITSspdLayer1Coverage.C @@ -18,7 +18,7 @@ void AliITSspdLayer1Coverage(TString hfn="galice.root",Int_t mod=-1, AliCDBManager* man = AliCDBManager::Instance(); if (!man->IsDefaultStorageSet()) { printf("Setting a local default storage and run number 0\n"); - man->SetDefaultStorage("local://$ALICE_ROOT"); + man->SetDefaultStorage("local://$ALICE_ROOT/OCDB"); man->SetRun(0); }else { printf("Using deafult storage \n"); diff --git a/ITS/DoVerticesSPD.C b/ITS/DoVerticesSPD.C index aee815b5e82..30d502fade2 100644 --- a/ITS/DoVerticesSPD.C +++ b/ITS/DoVerticesSPD.C @@ -39,7 +39,7 @@ Bool_t DoVerticesSPD(Int_t optdebug=1){ AliCDBManager* man = AliCDBManager::Instance(); if (!man->IsDefaultStorageSet()) { printf("Setting a local default storage and run number 0\n"); - man->SetDefaultStorage("local://$ALICE_ROOT"); + man->SetDefaultStorage("local://$ALICE_ROOT/OCDB"); man->SetRun(0); } else { diff --git a/ITS/DrawITSAlignObj.C b/ITS/DrawITSAlignObj.C index 21ef98e7058..01de7dac4e3 100644 --- a/ITS/DrawITSAlignObj.C +++ b/ITS/DrawITSAlignObj.C @@ -40,7 +40,7 @@ void DrawITSAlignObj(Bool_t local=kFALSE) { // return; } }else{ - cdb->SetDefaultStorage("local://$ALICE_ROOT"); + cdb->SetDefaultStorage("local://$ALICE_ROOT/OCDB"); cdb->SetRun(0); AliGeomManager::LoadGeometry("geometry.root"); //load geom from default CDB storage const char* filename="ITSfullMisalignment.root"; diff --git a/ITS/EvaluateSPDEffWithTracklets.C b/ITS/EvaluateSPDEffWithTracklets.C index c07f0688e35..b7686d841cc 100644 --- a/ITS/EvaluateSPDEffWithTracklets.C +++ b/ITS/EvaluateSPDEffWithTracklets.C @@ -101,7 +101,7 @@ void EvaluateSPDEffWithTracklets(Char_t* dir=".", Bool_t mc=kTRUE, Bool_t bckg=k } if (!man->IsDefaultStorageSet()) { printf("Setting a local default CDB storage and run number 0\n"); - man->SetDefaultStorage("local://$ALICE_ROOT"); + man->SetDefaultStorage("local://$ALICE_ROOT/OCDB"); man->SetRun(0); } // retrives geometry diff --git a/ITS/MakeCalibrationSSD.C b/ITS/MakeCalibrationSSD.C index 4eb6ee54ffa..d0a0c355722 100644 --- a/ITS/MakeCalibrationSSD.C +++ b/ITS/MakeCalibrationSSD.C @@ -1,7 +1,7 @@ void MakeCalibrationSSD(Int_t firstRun=0,Int_t lastRun=999999999 ){ if(!AliCDBManager::Instance()->IsDefaultStorageSet()) { - AliCDBManager::Instance()->SetDefaultStorage("local://$ALICE_ROOT/"); + AliCDBManager::Instance()->SetDefaultStorage("local://$ALICE_ROOT/OCDB/"); } AliCDBMetaData *md1= new AliCDBMetaData(); // metaData describing the object diff --git a/ITS/MakeITSFullMisAlignment.C b/ITS/MakeITSFullMisAlignment.C index bf8f9db49c3..65b7eeb747d 100644 --- a/ITS/MakeITSFullMisAlignment.C +++ b/ITS/MakeITSFullMisAlignment.C @@ -32,7 +32,7 @@ void MakeITSFullMisAlignment() { // Activate CDB storage and load geometry from CDB AliCDBManager* cdb = AliCDBManager::Instance(); - if(!cdb->IsDefaultStorageSet()) cdb->SetDefaultStorage("local://$ALICE_ROOT"); + if(!cdb->IsDefaultStorageSet()) cdb->SetDefaultStorage("local://$ALICE_ROOT/OCDB"); cdb->SetRun(0); AliCDBStorage* storage = NULL; diff --git a/ITS/MakeITSMilleSuperModules.C b/ITS/MakeITSMilleSuperModules.C index c11ad76e43e..5e881544d59 100644 --- a/ITS/MakeITSMilleSuperModules.C +++ b/ITS/MakeITSMilleSuperModules.C @@ -26,7 +26,7 @@ void MakeITSMilleSuperModules(char *geomfile="geometry.root") { if (!geomfile) { // look for default geometry // Activate CDB storage and load geometry from CDB AliCDBManager* cdb = AliCDBManager::Instance(); - if(!cdb->IsDefaultStorageSet()) cdb->SetDefaultStorage("local://$ALICE_ROOT"); + if(!cdb->IsDefaultStorageSet()) cdb->SetDefaultStorage("local://$ALICE_ROOT/OCDB"); cdb->SetRun(0); AliCDBStorage* storage = NULL; diff --git a/ITS/MakeITSPlaneEfficiencySDD.C b/ITS/MakeITSPlaneEfficiencySDD.C index 60ab1b7ff9b..e283359886c 100644 --- a/ITS/MakeITSPlaneEfficiencySDD.C +++ b/ITS/MakeITSPlaneEfficiencySDD.C @@ -10,7 +10,7 @@ void MakeITSPlaneEfficiencySDD(Int_t firstRun=0,Int_t lastRun=AliCDBRunRange::Infinity()){ if(!AliCDBManager::Instance()->IsDefaultStorageSet()) { - AliCDBManager::Instance()->SetDefaultStorage("local://$ALICE_ROOT"); + AliCDBManager::Instance()->SetDefaultStorage("local://$ALICE_ROOT/OCDB"); } AliCDBMetaData *md1= new AliCDBMetaData(); // metaData describing the object diff --git a/ITS/MakeITSPlaneEfficiencySPD.C b/ITS/MakeITSPlaneEfficiencySPD.C index 68d21cc4d01..b78054dbe68 100644 --- a/ITS/MakeITSPlaneEfficiencySPD.C +++ b/ITS/MakeITSPlaneEfficiencySPD.C @@ -15,7 +15,7 @@ void MakeITSPlaneEfficiencySPD(Int_t firstRun=0, Int_t lastRun=AliCDBRunRange::I printf("Efficiency must be in the range [0,1]: nothing done"); } if(!AliCDBManager::Instance()->IsDefaultStorageSet()) { - AliCDBManager::Instance()->SetDefaultStorage("local://$ALICE_ROOT"); + AliCDBManager::Instance()->SetDefaultStorage("local://$ALICE_ROOT/OCDB"); } AliCDBMetaData *md1= new AliCDBMetaData(); // metaData describing the object diff --git a/ITS/MakeITSPlaneEfficiencySSD.C b/ITS/MakeITSPlaneEfficiencySSD.C index 6ec4f965688..d66c1338ac0 100644 --- a/ITS/MakeITSPlaneEfficiencySSD.C +++ b/ITS/MakeITSPlaneEfficiencySSD.C @@ -11,7 +11,7 @@ void MakeITSPlaneEfficiencySSD(Int_t firstRun=0,Int_t lastRun=AliCDBRunRange::Infinity()){ if(!AliCDBManager::Instance()->IsDefaultStorageSet()) { - AliCDBManager::Instance()->SetDefaultStorage("local://$ALICE_ROOT"); + AliCDBManager::Instance()->SetDefaultStorage("local://$ALICE_ROOT/OCDB"); } AliCDBMetaData *md1= new AliCDBMetaData(); // metaData describing the object diff --git a/ITS/MakeITSResMisAlignment.C b/ITS/MakeITSResMisAlignment.C index cf28c08bd28..69752558e47 100644 --- a/ITS/MakeITSResMisAlignment.C +++ b/ITS/MakeITSResMisAlignment.C @@ -32,7 +32,7 @@ void MakeITSResMisAlignment() { // Activate CDB storage and load geometry from CDB AliCDBManager* cdb = AliCDBManager::Instance(); - if(!cdb->IsDefaultStorageSet()) cdb->SetDefaultStorage("local://$ALICE_ROOT"); + if(!cdb->IsDefaultStorageSet()) cdb->SetDefaultStorage("local://$ALICE_ROOT/OCDB"); cdb->SetRun(0); AliCDBStorage* storage = NULL; diff --git a/ITS/MakeITSZeroMisAlignment.C b/ITS/MakeITSZeroMisAlignment.C index 4cab933b81c..d61b64eef76 100644 --- a/ITS/MakeITSZeroMisAlignment.C +++ b/ITS/MakeITSZeroMisAlignment.C @@ -7,7 +7,7 @@ void MakeITSZeroMisAlignment(){ // Activate CDB storage and load geometry from CDB AliCDBManager* cdb = AliCDBManager::Instance(); - if(!cdb->IsDefaultStorageSet()) cdb->SetDefaultStorage("local://$ALICE_ROOT"); + if(!cdb->IsDefaultStorageSet()) cdb->SetDefaultStorage("local://$ALICE_ROOT/OCDB"); cdb->SetRun(0); AliCDBStorage* storage = NULL; diff --git a/ITS/PlotSDDDigits.C b/ITS/PlotSDDDigits.C index 1fa6d79f2d5..9206774bb12 100644 --- a/ITS/PlotSDDDigits.C +++ b/ITS/PlotSDDDigits.C @@ -32,7 +32,7 @@ Int_t PlotSDDDigits(Int_t lay, Int_t lad, Int_t iev=0){ AliCDBManager* man = AliCDBManager::Instance(); if (!man->IsDefaultStorageSet()) { printf("Setting a local default storage and run number 0\n"); - man->SetDefaultStorage("local://$ALICE_ROOT"); + man->SetDefaultStorage("local://$ALICE_ROOT/OCDB"); man->SetRun(0); } else { diff --git a/ITS/ShowITSHitsRecPoints.C b/ITS/ShowITSHitsRecPoints.C index 79d2fa668c5..98c83c9d516 100644 --- a/ITS/ShowITSHitsRecPoints.C +++ b/ITS/ShowITSHitsRecPoints.C @@ -37,7 +37,7 @@ Int_t ShowITSHitsRecPoints(Bool_t align=kFALSE, AliCDBManager* man = AliCDBManager::Instance(); if (!man->IsDefaultStorageSet()) { printf("Setting a local default storage and run number 0\n"); - man->SetDefaultStorage("local://$ALICE_ROOT"); + man->SetDefaultStorage("local://$ALICE_ROOT/OCDB"); man->SetRun(0); } else { @@ -347,7 +347,7 @@ Int_t ShowITSHitsRecPointsNtuple(Bool_t align=kFALSE, AliCDBManager* man = AliCDBManager::Instance(); if (!man->IsDefaultStorageSet()) { printf("Setting a local default storage and run number 0\n"); - man->SetDefaultStorage("local://$ALICE_ROOT"); + man->SetDefaultStorage("local://$ALICE_ROOT/OCDB"); man->SetRun(0); } else { diff --git a/ITS/ShowSPDRecPoints.C b/ITS/ShowSPDRecPoints.C index 0b721a2433c..db05a58845f 100644 --- a/ITS/ShowSPDRecPoints.C +++ b/ITS/ShowSPDRecPoints.C @@ -213,7 +213,7 @@ void ShowSPDRecPoints(Int_t RunStart, Int_t RunStop){ AliCDBManager* man = AliCDBManager::Instance(); if (!man->IsDefaultStorageSet()) { printf("Setting a local default storage and run number 0\n"); - man->SetDefaultStorage("local://$ALICE_ROOT"); + man->SetDefaultStorage("local://$ALICE_ROOT/OCDB"); man->SetRun(0); } else { diff --git a/ITS/TestPreprocessorSSD.C b/ITS/TestPreprocessorSSD.C index e7ae53da603..3b7b68fcf02 100644 --- a/ITS/TestPreprocessorSSD.C +++ b/ITS/TestPreprocessorSSD.C @@ -11,8 +11,8 @@ void TestPreprocessorSSD() // initialize location of CDB // AliCDBManager::Instance()->SetDefaultStorage("local://${ALICE_ROOT}/SHUTTLE/TestShuttle/TestCDB"); - AliTestShuttle::SetMainCDB("local://$ALICE_ROOT/SHUTTLE/TestShuttle/TestCDB"); - AliTestShuttle::SetMainRefStorage("local://$ALICE_ROOT/SHUTTLE/TestShuttle/TestReference"); + AliTestShuttle::SetMainCDB("local://$ALICE_ROOT/OCDB/SHUTTLE/TestShuttle/TestCDB"); + AliTestShuttle::SetMainRefStorage("local://$ALICE_ROOT/OCDB/SHUTTLE/TestShuttle/TestReference"); printf("Test OCDB storage Uri: %s\n", AliShuttleInterface::GetMainCDB().Data()); printf("Test Reference storage Uri: %s\n", AliShuttleInterface::GetMainRefStorage().Data()); diff --git a/MUON/AliMUONCDB.h b/MUON/AliMUONCDB.h index 39e6ba77889..5de34d6c073 100644 --- a/MUON/AliMUONCDB.h +++ b/MUON/AliMUONCDB.h @@ -27,8 +27,8 @@ class AliMUONCDB : public TObject { public: /// Ctor. change the path for testing the Shuttle preprocessor, to - /// "local://$ALICE_ROOT/SHUTTLE/TestShuttle/TestCDB" - AliMUONCDB(const char* cdbpath = "local://$ALICE_ROOT"); + /// "local://$ALICE_ROOT/OCDB/SHUTTLE/TestShuttle/TestCDB" + AliMUONCDB(const char* cdbpath = "local://$ALICE_ROOT/OCDB"); virtual ~AliMUONCDB(); void SetMaxNofChannelsToGenerate(Int_t n); diff --git a/MUON/AliMUONGainEventGenerator.cxx b/MUON/AliMUONGainEventGenerator.cxx index 16ee79a9cb4..a8184df604a 100644 --- a/MUON/AliMUONGainEventGenerator.cxx +++ b/MUON/AliMUONGainEventGenerator.cxx @@ -190,6 +190,6 @@ AliMUONGainEventGenerator::WriteToCDB(TObject* object, Int_t runNumber) md.SetResponsible("AliMUONGainEventGenerator"); AliCDBManager* man = AliCDBManager::Instance(); - man->SetDefaultStorage("local://$ALICE_ROOT/SHUTTLE/TestShuttle/TestCDB"); + man->SetDefaultStorage("local://$ALICE_ROOT/OCDB/SHUTTLE/TestShuttle/TestCDB"); man->Put(object,id,&md); } diff --git a/MUON/AliMUONTriggerEfficiencyCells.h b/MUON/AliMUONTriggerEfficiencyCells.h index 02c090bff0c..d5c929e4323 100755 --- a/MUON/AliMUONTriggerEfficiencyCells.h +++ b/MUON/AliMUONTriggerEfficiencyCells.h @@ -38,13 +38,13 @@ public: // Methods for display void DisplayEfficiency(Bool_t perSlat=kFALSE, - const Char_t* cdbStorage = "local://$ALICE_ROOT", + const Char_t* cdbStorage = "local://$ALICE_ROOT/OCDB", Int_t runNumber=0); // Methods for efficiency check /// Set the list of fired strips void SetFiredStrips(TList *firedStrips){fFiredStrips = firedStrips;} - void CheckFiredStrips(const Char_t* cdbStorage = "local://$ALICE_ROOT", + void CheckFiredStrips(const Char_t* cdbStorage = "local://$ALICE_ROOT/OCDB", Int_t runNumber=0); // Check for strips with lower counts than others: // syntomatic of possible read-out problems in boards diff --git a/MUON/AliMUONTriggerGUI.cxx b/MUON/AliMUONTriggerGUI.cxx index c7f83fd4e83..45c39fc123c 100644 --- a/MUON/AliMUONTriggerGUI.cxx +++ b/MUON/AliMUONTriggerGUI.cxx @@ -144,7 +144,7 @@ AliMUONTriggerGUI::AliMUONTriggerGUI(Int_t runNumber) fRawTriggerStore->Create(); fCDBManager = AliCDBManager::Instance(); - fCDBManager->SetDefaultStorage("local://$ALICE_ROOT"); + fCDBManager->SetDefaultStorage("local://$ALICE_ROOT/OCDB"); fCDBManager->SetRun(runNumber); AliMpCDB::LoadDDLStore(); fCalibrationData = new AliMUONCalibrationData(runNumber); diff --git a/MUON/AlirootRun_MUONtest.sh b/MUON/AlirootRun_MUONtest.sh index 52de790ab16..16d75a227cc 100755 --- a/MUON/AlirootRun_MUONtest.sh +++ b/MUON/AlirootRun_MUONtest.sh @@ -211,7 +211,7 @@ EOF if [ -f "$OUTDIR/$SIMDIR/galice.root" ]; then aliroot -l -b << EOF AliCDBManager* man = AliCDBManager::Instance(); - man->SetDefaultStorage("local://$ALICE_ROOT"); + man->SetDefaultStorage("local://$ALICE_ROOT/OCDB"); AliMUONMCDataInterface mcdSim("$OUTDIR/$SIMDIR/galice.root"); mcdSim.DumpKine($DUMPEVENT); > $OUTDIR/dump.$DUMPEVENT.kine mcdSim.DumpHits($DUMPEVENT); > $OUTDIR/dump.$DUMPEVENT.hits @@ -227,7 +227,7 @@ EOF if [ -f "$OUTDIR/galice.root" ]; then aliroot -l -b << EOF AliCDBManager* man = AliCDBManager::Instance(); - man->SetDefaultStorage("local://$ALICE_ROOT"); + man->SetDefaultStorage("local://$ALICE_ROOT/OCDB"); AliMUONDataInterface dRec("$OUTDIR/galice.root"); dRec.DumpDigits($DUMPEVENT,true); > $OUTDIR/dump.$DUMPEVENT.recdigits dRec.DumpRecPoints($DUMPEVENT); > $OUTDIR/dump.$DUMPEVENT.recpoints diff --git a/MUON/AlirootRun_MUONtestAlign.sh b/MUON/AlirootRun_MUONtestAlign.sh index 1d240887bf4..821a6a5eb0e 100755 --- a/MUON/AlirootRun_MUONtestAlign.sh +++ b/MUON/AlirootRun_MUONtestAlign.sh @@ -33,7 +33,7 @@ aliroot -b >& testSim.out << EOF // Uncoment following lines to run simulation with local full mis-alignment // (generated via MUONGenerateGeometryData.C macro) AliCDBManager* man = AliCDBManager::Instance(); -man->SetDefaultStorage("local://$ALICE_ROOT"); +man->SetDefaultStorage("local://$ALICE_ROOT/OCDB"); man->SetSpecificStorage("MUON/Align/Data","local://FullMisAlignCDB"); AliSimulation MuonSim("$ALICE_ROOT/MUON/Config.C"); MuonSim.SetSeed($SEED); @@ -57,8 +57,8 @@ aliroot -b >& testReco.out << EOF // Uncoment following lines to run reconstruction with local full mis-alignment // (generated via MUONGenerateGeometryData.C macro) //AliCDBManager* man = AliCDBManager::Instance(); -//man->SetDefaultStorage("local://$ALICE_ROOT"); -//man->SetSpecificStorage("MUON/Align/Data","local://$ALICE_ROOT/MUON/FullMisAlignCDB"); +//man->SetDefaultStorage("local://$ALICE_ROOT/OCDB"); +//man->SetSpecificStorage("MUON/Align/Data","local://$ALICE_ROOT/OCDB/MUON/FullMisAlignCDB"); gRandom->SetSeed($SEED); AliMagFMaps* field = new AliMagFMaps("Maps","Maps", 1, 1., 10., AliMagFMaps::k5kG); AliTracker::SetFieldMap(field, kFALSE); diff --git a/MUON/AlirootRun_MUONtestlong.sh b/MUON/AlirootRun_MUONtestlong.sh index 32720d1ee67..be1ddb93794 100755 --- a/MUON/AlirootRun_MUONtestlong.sh +++ b/MUON/AlirootRun_MUONtestlong.sh @@ -21,8 +21,8 @@ aliroot -b >& testSim.out << EOF // Uncoment following lines to run simulation with local residual mis-alignment // (generated via MUONGenerateGeometryData.C macro) // AliCDBManager* man = AliCDBManager::Instance(); -// man->SetDefaultStorage("local://$ALICE_ROOT"); -// man->SetSpecificStorage("MUON/Align/Data","local://$ALICE_ROOT/MUON/ResMisAlignCDB"); +// man->SetDefaultStorage("local://$ALICE_ROOT/OCDB"); +// man->SetSpecificStorage("MUON/Align/Data","local://$ALICE_ROOT/OCDB/MUON/ResMisAlignCDB"); AliSimulation MuonSim("$ALICE_ROOT/MUON/Config.C"); MuonSim.SetSeed($SEED); MuonSim.SetMakeTrigger("MUON"); @@ -33,7 +33,7 @@ EOF echo "Running reconstruction ..." aliroot -b >& testReco.out << EOF -man->SetDefaultStorage("local://$ALICE_ROOT"); +man->SetDefaultStorage("local://$ALICE_ROOT/OCDB"); gRandom->SetSeed($SEED); AliMagFMaps* field = new AliMagFMaps("Maps","Maps", 1, 1., 10., AliMagFMaps::k5kG); AliTracker::SetFieldMap(field, kFALSE); diff --git a/MUON/MUONCheck.C b/MUON/MUONCheck.C index 4e1c5a963c9..e179d417890 100644 --- a/MUON/MUONCheck.C +++ b/MUON/MUONCheck.C @@ -39,7 +39,7 @@ void MUONCheck(Int_t firstEvent, Int_t lastEvent, { // Set default CDB storage AliCDBManager* man = AliCDBManager::Instance(); - man->SetDefaultStorage("local://$ALICE_ROOT"); + man->SetDefaultStorage("local://$ALICE_ROOT/OCDB"); gSystem->Load("libMUONevaluation"); diff --git a/MUON/MUONCheckDI.C b/MUON/MUONCheckDI.C index ec765711db4..8dfd2681766 100644 --- a/MUON/MUONCheckDI.C +++ b/MUON/MUONCheckDI.C @@ -790,7 +790,7 @@ bool TriggersOk() */ bool MUONCheckDI(bool checkSim = true, bool checkRec = true) { - AliCDBManager::Instance()->SetDefaultStorage("local://$ALICE_ROOT"); + AliCDBManager::Instance()->SetDefaultStorage("local://$ALICE_ROOT/OCDB"); // Note: we do not bother checking the AliMUONMCDataInterface::Particle, // AliMUONMCDataInterface::Stack and AliMUONMCDataInterface::TrackRefs methods diff --git a/MUON/MUONClusterInfo.C b/MUON/MUONClusterInfo.C index cee85ca08a3..81764f1a805 100644 --- a/MUON/MUONClusterInfo.C +++ b/MUON/MUONClusterInfo.C @@ -245,7 +245,7 @@ void Prepare() // Load mapping AliCDBManager* man = AliCDBManager::Instance(); - man->SetDefaultStorage("local://$ALICE_ROOT"); + man->SetDefaultStorage("local://$ALICE_ROOT/OCDB"); man->SetRun(0); if ( ! AliMpCDB::LoadDDLStore() ) { Error("MUONRefit","Could not access mapping from OCDB !"); diff --git a/MUON/MUONGenerateGeometryData.C b/MUON/MUONGenerateGeometryData.C index a5433719b88..c6e6d20c3f6 100644 --- a/MUON/MUONGenerateGeometryData.C +++ b/MUON/MUONGenerateGeometryData.C @@ -56,7 +56,7 @@ void MUONGenerateGeometryData(Bool_t transforms = true, // Default CDB and run number AliCDBManager* man = AliCDBManager::Instance(); - man->SetDefaultStorage("local://$ALICE_ROOT"); + man->SetDefaultStorage("local://$ALICE_ROOT/OCDB"); man->SetRun(0); // Initialize diff --git a/MUON/MUONOfflineShift.C b/MUON/MUONOfflineShift.C index e5d50d4de84..6be9d3e0388 100644 --- a/MUON/MUONOfflineShift.C +++ b/MUON/MUONOfflineShift.C @@ -216,7 +216,7 @@ void MUONOfflineShift(const char* input="alien:///alice/data/2008/LHC08a/0000219 AliCodeTimer::Instance()->Reset(); - AliCDBManager::Instance()->SetDefaultStorage("local://$ALICE_ROOT"); + AliCDBManager::Instance()->SetDefaultStorage("local://$ALICE_ROOT/OCDB"); AliCDBManager::Instance()->SetRun(0); AliMpCDB::LoadDDLStore(); diff --git a/MUON/MUONReCalcGlobalTrigger.C b/MUON/MUONReCalcGlobalTrigger.C index 39df3e29417..8b1a1695cd5 100644 --- a/MUON/MUONReCalcGlobalTrigger.C +++ b/MUON/MUONReCalcGlobalTrigger.C @@ -200,7 +200,7 @@ void MUONReCalcGlobalTrigger(const char* input) { Int_t runNumber = 0; AliCDBManager* man = AliCDBManager::Instance(); - man->SetDefaultStorage("local://$ALICE_ROOT"); + man->SetDefaultStorage("local://$ALICE_ROOT/OCDB"); man->SetRun(runNumber); AliMpCDB::LoadDDLStore(); diff --git a/MUON/MUONRefit.C b/MUON/MUONRefit.C index 34176ebc08c..a1b85eabe5f 100644 --- a/MUON/MUONRefit.C +++ b/MUON/MUONRefit.C @@ -224,7 +224,7 @@ void Prepare() // Load mapping AliCDBManager* man = AliCDBManager::Instance(); - man->SetDefaultStorage("local://$ALICE_ROOT"); + man->SetDefaultStorage("local://$ALICE_ROOT/OCDB"); man->SetRun(0); if ( ! AliMpCDB::LoadDDLStore() ) { Error("MUONRefit","Could not access mapping from OCDB !"); diff --git a/MUON/MUONStatusMap.C b/MUON/MUONStatusMap.C index efbf712d393..41b7e6f5c92 100644 --- a/MUON/MUONStatusMap.C +++ b/MUON/MUONStatusMap.C @@ -79,7 +79,7 @@ void FindBad(AliMUONPadStatusMaker& statusMaker, Int_t mask, Int_t& nBadPads, In } } -AliMUONVStore* MUONStatusMap(const TString& cdbStorage = "local://$ALICE_ROOT", +AliMUONVStore* MUONStatusMap(const TString& cdbStorage = "local://$ALICE_ROOT/OCDB", Int_t runNumber=0, Bool_t statusOnly=kFALSE, Int_t mask=0x8080) { diff --git a/MUON/MUONTrigger.C b/MUON/MUONTrigger.C index 9b204151201..590ade37662 100644 --- a/MUON/MUONTrigger.C +++ b/MUON/MUONTrigger.C @@ -59,7 +59,7 @@ void MUONTrigger(const char* filename) // Creating MUONTriggerDecision AliCDBManager* cdbManager = AliCDBManager::Instance(); - cdbManager->SetDefaultStorage("local://$ALICE_ROOT"); + cdbManager->SetDefaultStorage("local://$ALICE_ROOT/OCDB"); Int_t runnumber = cdbManager->GetRun(); AliMpCDB::LoadDDLStore(); diff --git a/MUON/MUONTriggerEfficiency.C b/MUON/MUONTriggerEfficiency.C index 97cf6ab626e..2a8c1d6b274 100644 --- a/MUON/MUONTriggerEfficiency.C +++ b/MUON/MUONTriggerEfficiency.C @@ -67,7 +67,7 @@ void MUONTriggerEfficiency(const char* filenameSim="galice_sim.root", // Set default CDB storage AliCDBManager* man = AliCDBManager::Instance(); - man->SetDefaultStorage("local://$ALICE_ROOT"); + man->SetDefaultStorage("local://$ALICE_ROOT/OCDB"); // output file diff --git a/MUON/MUONefficiency.C b/MUON/MUONefficiency.C index ce752fed8ba..42838a8e859 100644 --- a/MUON/MUONefficiency.C +++ b/MUON/MUONefficiency.C @@ -86,7 +86,7 @@ Bool_t MUONefficiency( char* filename = "galice.root", char* geoFilename = "geom // Set default CDB storage AliCDBManager* man = AliCDBManager::Instance(); - man->SetDefaultStorage("local://$ALICE_ROOT"); + man->SetDefaultStorage("local://$ALICE_ROOT/OCDB"); Double_t MUON_MASS = 0.105658369; Double_t UPSILON_MASS = 9.4603 ; diff --git a/MUON/MakeMUONFullMisAlignment.C b/MUON/MakeMUONFullMisAlignment.C index c69d07b79ca..023b505d718 100644 --- a/MUON/MakeMUONFullMisAlignment.C +++ b/MUON/MakeMUONFullMisAlignment.C @@ -49,7 +49,7 @@ void MakeMUONFullMisAlignment() const char* macroname = "MakeMUONFullMisAlignment.C"; // Activate CDB storage and load geometry from CDB AliCDBManager* cdb = AliCDBManager::Instance(); - if(!cdb->IsDefaultStorageSet()) cdb->SetDefaultStorage("local://$ALICE_ROOT"); + if(!cdb->IsDefaultStorageSet()) cdb->SetDefaultStorage("local://$ALICE_ROOT/OCDB"); cdb->SetRun(0); AliCDBStorage* storage = 0; diff --git a/MUON/MakeMUONRecoParamArray.C b/MUON/MakeMUONRecoParamArray.C index 3360c9d66e5..966ae60e59d 100644 --- a/MUON/MakeMUONRecoParamArray.C +++ b/MUON/MakeMUONRecoParamArray.C @@ -47,7 +47,7 @@ void MakeMUONRecoParamArray(Int_t startRun = 0, Int_t endRun = AliCDBRunRange::I // init CDB AliCDBManager* man = AliCDBManager::Instance(); - if(!man->IsDefaultStorageSet()) man->SetDefaultStorage("local://$ALICE_ROOT"); + if(!man->IsDefaultStorageSet()) man->SetDefaultStorage("local://$ALICE_ROOT/OCDB"); man->SetRun(startRun); // set RecoParams diff --git a/MUON/MakeMUONResMisAlignment.C b/MUON/MakeMUONResMisAlignment.C index 0bf72eb0490..cc088f8be8e 100644 --- a/MUON/MakeMUONResMisAlignment.C +++ b/MUON/MakeMUONResMisAlignment.C @@ -48,7 +48,7 @@ void MakeMUONResMisAlignment() const char* macroname = "MakeMUONResMisAlignment.C"; // Activate CDB storage and load geometry from CDB AliCDBManager* cdb = AliCDBManager::Instance(); - if(!cdb->IsDefaultStorageSet()) cdb->SetDefaultStorage("local://$ALICE_ROOT"); + if(!cdb->IsDefaultStorageSet()) cdb->SetDefaultStorage("local://$ALICE_ROOT/OCDB"); cdb->SetRun(0); AliCDBStorage* storage = 0; diff --git a/MUON/MakeMUONSingleRecoParam.C b/MUON/MakeMUONSingleRecoParam.C index 2ff1c872c15..cf3ea988a40 100644 --- a/MUON/MakeMUONSingleRecoParam.C +++ b/MUON/MakeMUONSingleRecoParam.C @@ -44,7 +44,7 @@ void MakeMUONSingleRecoParam(Int_t startRun = 0, Int_t endRun = AliCDBRunRange:: // init CDB AliCDBManager* man = AliCDBManager::Instance(); - if(!man->IsDefaultStorageSet()) man->SetDefaultStorage("local://$ALICE_ROOT"); + if(!man->IsDefaultStorageSet()) man->SetDefaultStorage("local://$ALICE_ROOT/OCDB"); man->SetRun(startRun); // choose desired set of parameters diff --git a/MUON/MakeMUONZeroMisAlignment.C b/MUON/MakeMUONZeroMisAlignment.C index 3ac1c37b9af..f4e0dae46e1 100644 --- a/MUON/MakeMUONZeroMisAlignment.C +++ b/MUON/MakeMUONZeroMisAlignment.C @@ -45,7 +45,7 @@ void MakeMUONZeroMisAlignment() const char* macroname = "MakeMUONZeroMisAlignment.C"; // Activate CDB storage and load geometry from CDB AliCDBManager* cdb = AliCDBManager::Instance(); - if(!cdb->IsDefaultStorageSet()) cdb->SetDefaultStorage("local://$ALICE_ROOT"); + if(!cdb->IsDefaultStorageSet()) cdb->SetDefaultStorage("local://$ALICE_ROOT/OCDB"); cdb->SetRun(0); AliCDBStorage* storage = 0; diff --git a/MUON/READMEbase.txt b/MUON/READMEbase.txt index 5aaa4b617a2..d304bff5d21 100644 --- a/MUON/READMEbase.txt +++ b/MUON/READMEbase.txt @@ -18,7 +18,7 @@ for MC information, use AliMUONMCDataInterface : 
 > aliroot (or root with just the loading of MUON libs, see loadlibs.C)
-root [0] AliCDBManager::Instance()->SetDefaultStorage("local://$ALICE_ROOT");
+root [0] AliCDBManager::Instance()->SetDefaultStorage("local://$ALICE_ROOT/OCDB");
 root [1] AliMUONMCDataInterface mcdi("galice.root");
 root [2] mcdi.DumpKine(5);       > dump.kine
 root [3] mcdi.DumpHits(5);       > dump.hits
@@ -29,7 +29,7 @@ for all other information, use AliMUONDataInterface :
 
 
 > aliroot
-root [0] AliCDBManager::Instance()->SetDefaultStorage("local://$ALICE_ROOT");
+root [0] AliCDBManager::Instance()->SetDefaultStorage("local://$ALICE_ROOT/OCDB");
 root [1] AliMUONDataInterface di("galice.root");
 root [2] di.DumpDigits(5);     > dump.digits
 root [3] di.DumpSDigits(5);    > dump.sdigits
diff --git a/MUON/READMEcalib.txt b/MUON/READMEcalib.txt
index a02388840f6..6875d3afa97 100644
--- a/MUON/READMEcalib.txt
+++ b/MUON/READMEcalib.txt
@@ -48,9 +48,9 @@ One very important notion is that of the DefaultStorage (which you might set wit
  AliCDBManager::Instance()->SetDefaultStorage(path)), which tells the CDB library where
  the CDB is sitting (either locally on disk, or on the grid).
 
-For local tests, path will be most likely =  "local://$ALICE_ROOT"
+For local tests, path will be most likely =  "local://$ALICE_ROOT/OCDB"
 (i.e. there is, in CVS a slim version of the calibration objects needed
-for running the MUON code), or  "local://$ALICE_ROOT/SHUTTLE/TestShuttle/TestCDB 
+for running the MUON code), or  "local://$ALICE_ROOT/OCDB/SHUTTLE/TestShuttle/TestCDB 
 for Shuttle testing.
 
 When using alien, the path definition can be eg.
diff --git a/MUON/READMEshuttle.txt b/MUON/READMEshuttle.txt
index 1bbeea79a19..602201313fe 100644
--- a/MUON/READMEshuttle.txt
+++ b/MUON/READMEshuttle.txt
@@ -68,13 +68,13 @@ are taken from the Offline Condition DataBase (OCDB) (which is itself fakely fil
 using the WritePedestals() method of AliMUONCDB class
 
 So first generate a valid pedestal CDB entry by using the AliMUONCDB class. There's one
- little trick : you should first point to the "default" OCDB (local://$ALICE_ROOT) in
+ little trick : you should first point to the "default" OCDB (local://$ALICE_ROOT/OCDB) in
  order to get the mapping loaded, then only you can play with another OCDB. 
  Or, alternatively, you can put the mapping stuff in the test OCDB, like this :
  
 
 root[] AliMpDDLStore::ReadData(); // read mapping from ASCII files
-root[] const char* cdbpath="local://$ALICE_ROOT/SHUTTLE/TestShuttle/TestCDB"; // where to put the CDB
+root[] const char* cdbpath="local://$ALICE_ROOT/OCDB/SHUTTLE/TestShuttle/TestCDB"; // where to put the CDB
 root[] AliCDBManager::Instance()->SetDefaultStorage(cdbpath);
 root[] AliMpCDB::WriteMpSegmentation();
 root[] AliMpCDB::WriteDDLStore();
@@ -84,11 +84,11 @@ If you've not put the mapping in the test database, then you must start with the
  test database :
  
 
-root[] AliCDBManager::Instance()->SetDefaultStorage("local://$ALICE_ROOT"); // only if you've not put the mapping in test OCDB
+root[] AliCDBManager::Instance()->SetDefaultStorage("local://$ALICE_ROOT/OCDB"); // only if you've not put the mapping in test OCDB
 root[] AliCDBManager::Instance()->SetRun(0); // only if you've not put the mapping in test OCDB
 root[] AliMpCDB::LoadDDLStore(); // only if you've not put the mapping in test OCDB
 // below are lines to be executed whatever you did with the mapping...
-root[] const char* cdbpath="local://$ALICE_ROOT/SHUTTLE/TestShuttle/TestCDB"; // where to put the CDB
+root[] const char* cdbpath="local://$ALICE_ROOT/OCDB/SHUTTLE/TestShuttle/TestCDB"; // where to put the CDB
 root[] AliMUONCDB cdb(cdbpath)
 root[] Bool_t defaultValues = kFALSE; // to generate random values instead of plain zeros...
 root[] Int_t startRun = 80;
@@ -104,7 +104,7 @@ I-AliMUONCDB::ManuList: Manu List generated.
 I-AliMUONCDB::MakePedestalStore: 16828 Manus and 1064008 channels.
 I-AliMUONCDB::WritePedestals: Ngenerated = 1064008
 I-AliCDBManager::Init: AliEn classes enabled in Root. AliCDBGrid factory registered.
-I-AliCDBManager::SetDefaultStorage: Setting Default storage to: local://$ALICE_ROOT/SHUTTLE/TestShuttle/TestCDB
+I-AliCDBManager::SetDefaultStorage: Setting Default storage to: local://$ALICE_ROOT/OCDB/SHUTTLE/TestShuttle/TestCDB
 I-AliCDBLocal::PutEntry: CDB object stored into file ($ALICE_ROOT)/SHUTTLE/TestShuttle/TestCDB/MUON/Calib/Pedestals/Run80_80_v0_s0.root
 

 
@@ -112,7 +112,7 @@ Then use the AliMUONPedestalEventGenerator to produce simulated pedestal events.
 
 Usage (from the Root prompt) :
 
-AliMpCDB::LoadDDLStore2(); // load mapping from "default" OCDB=local://$ALICE_ROOT
+AliMpCDB::LoadDDLStore2(); // load mapping from "default" OCDB=local://$ALICE_ROOT/OCDB
 AliCDBManager::Instance()->SetDefaultStorage(cdbpath); // so you will read 
 // back pedestals values generated in the previous step
 const char* dateFileName = "raw.date"; // base filename for the output
@@ -164,7 +164,7 @@ So first you need to generate a valid pedestal CDB entry and a valid gain CDB
 entry by using the AliMUONCDB class, from the Root prompt:
 
 
-const char* cdbpath="local://$ALICE_ROOT/SHUTTLE/TestShuttle/TestCDB"; // where to put the CDB
+const char* cdbpath="local://$ALICE_ROOT/OCDB/SHUTTLE/TestShuttle/TestCDB"; // where to put the CDB
 AliMUONCDB cdb(cdbpath)
 Bool_t defaultValues = kFALSE; // to generate random values instead of plain zeros...
 Int_t gainRun = 80;
@@ -182,7 +182,7 @@ will be n x 4 date files (n is the number of fake injections, currently 9, and 4
 Usage (again, from the Root prompt) :
 
 
-const char* cdbpath="local://$ALICE_ROOT/SHUTTLE/TestShuttle/TestCDB"; // where to get the CDB
+const char* cdbpath="local://$ALICE_ROOT/OCDB/SHUTTLE/TestShuttle/TestCDB"; // where to get the CDB
 AliCDBManager::Instance()->SetDefaultStorage(cdbpath); // so you will read 
 // back pedestals and gain values generated in the previous step
 const char* dateFileName = "raw.date"; // base filename for the output
diff --git a/MUON/READMEsim.txt b/MUON/READMEsim.txt
index e49e76cd854..c4112a1bbd7 100644
--- a/MUON/READMEsim.txt
+++ b/MUON/READMEsim.txt
@@ -145,7 +145,7 @@ lines AlirootRun_MUONtest.sh).
 
 aliroot -b  >& testSim.out << EOF
 AliCDBManager* man = AliCDBManager::Instance();
-man->SetDefaultStorage("local://$ALICE_ROOT");
+man->SetDefaultStorage("local://$ALICE_ROOT/OCDB");
 man->SetSpecificStorage("MUON/align/Data","local://ResMisAlignCDB");
 AliSimulation MuonSim("$ALICE_ROOT/MUON/Config.C");
 MuonSim.SetWriteRawData("MUON");
diff --git a/MUON/TestMUONPreprocessor.C b/MUON/TestMUONPreprocessor.C
index 6d3319ff2e8..ed2c3fb1662 100644
--- a/MUON/TestMUONPreprocessor.C
+++ b/MUON/TestMUONPreprocessor.C
@@ -126,11 +126,11 @@ void TestMUONPreprocessor(Int_t runNumber=80,
   // The parameters are run, startTime, endTime
   AliTestShuttle* shuttle = new AliTestShuttle(runNumber, 0, 1);
   
-  const char* inputCDB = "local://$ALICE_ROOT/SHUTTLE/TestShuttle/TestCDB";
+  const char* inputCDB = "local://$ALICE_ROOT/OCDB/SHUTTLE/TestShuttle/TestCDB";
   //const char* inputCDB = "alien://folder=/alice/testdata/2008/TS08a/OCDB";
   
   AliTestShuttle::SetMainCDB(inputCDB);
-  AliTestShuttle::SetMainRefStorage("local://$ALICE_ROOT/SHUTTLE/TestShuttle/TestReference");
+  AliTestShuttle::SetMainRefStorage("local://$ALICE_ROOT/OCDB/SHUTTLE/TestShuttle/TestReference");
 
   TString rt(runType);
   rt.ToUpper();
diff --git a/MUON/TestRecPoints.C b/MUON/TestRecPoints.C
index 3aec6e66c73..84881838f70 100644
--- a/MUON/TestRecPoints.C
+++ b/MUON/TestRecPoints.C
@@ -80,7 +80,7 @@ Int_t GetPlane(Int_t ch, Int_t cath){return kNcathodes * ch + cath;}
 void ClusterSize(TList&, AliMUONVDigit*, Int_t&, Int_t);
 
 // Main Method
-void TestRecPoints(TString baseDir=".", TString outDir=".", Float_t adcCut = 10., Int_t whatToTest=kTrackTrig, Int_t runNumber=0, TString cdbStorage="local://$ALICE_ROOT")
+void TestRecPoints(TString baseDir=".", TString outDir=".", Float_t adcCut = 10., Int_t whatToTest=kTrackTrig, Int_t runNumber=0, TString cdbStorage="local://$ALICE_ROOT/OCDB")
 {
   const Int_t kNplanes = kNtrigChambers * kNcathodes;
   const Int_t kNslats = 18;
diff --git a/MUON/UpdateCDBCTPConfig.C b/MUON/UpdateCDBCTPConfig.C
index a9b12c19222..93fa3aab5f9 100644
--- a/MUON/UpdateCDBCTPConfig.C
+++ b/MUON/UpdateCDBCTPConfig.C
@@ -66,7 +66,7 @@
 void UpdateCDBCTPConfig(Bool_t check = false) {
   
   AliCDBManager* cdb = AliCDBManager::Instance();
-  cdb->SetDefaultStorage("local://$ALICE_ROOT");
+  cdb->SetDefaultStorage("local://$ALICE_ROOT/OCDB");
   cdb->SetRun(0);
 
   if (check) {
@@ -117,7 +117,7 @@ void UpdateCDBCTPConfig(Bool_t check = false) {
   md->SetAliRootVersion(av.Data());
   md->SetComment(Form("Default CTP configuration for MUON mode produced with root version %s and AliRoot version %s revision %d ",rootv,av.Data(),revnum));
 
-  AliCDBStorage* storage = cdb->GetStorage("local://$ALICE_ROOT");
+  AliCDBStorage* storage = cdb->GetStorage("local://$ALICE_ROOT/OCDB");
   storage->Put(trconfig,id,md);
   
 }
diff --git a/MUON/mapping/AliMpCDB.cxx b/MUON/mapping/AliMpCDB.cxx
index 22cc4178f2e..cf9586f311b 100644
--- a/MUON/mapping/AliMpCDB.cxx
+++ b/MUON/mapping/AliMpCDB.cxx
@@ -350,7 +350,7 @@ Bool_t AliMpCDB::WriteMpData()
 
   AliCDBManager* cdbManager = AliCDBManager::Instance();
   if ( ! cdbManager->GetDefaultStorage() )
-    cdbManager->SetDefaultStorage("local://$ALICE_ROOT");
+    cdbManager->SetDefaultStorage("local://$ALICE_ROOT/OCDB");
   
   AliCDBMetaData* cdbData = new AliCDBMetaData();
   cdbData->SetResponsible("Dimuon Offline project");
@@ -370,7 +370,7 @@ Bool_t AliMpCDB::WriteMpRunData()
 
   AliCDBManager* cdbManager = AliCDBManager::Instance();
   if ( ! cdbManager->GetDefaultStorage() )
-    cdbManager->SetDefaultStorage("local://$ALICE_ROOT");
+    cdbManager->SetDefaultStorage("local://$ALICE_ROOT/OCDB");
   
   AliCDBMetaData* cdbData = new AliCDBMetaData();
   cdbData->SetResponsible("Dimuon Offline project");
@@ -392,7 +392,7 @@ Bool_t AliMpCDB::WriteMpSegmentation(Bool_t readData)
 
   AliCDBManager* cdbManager = AliCDBManager::Instance();
   if ( ! cdbManager->GetDefaultStorage() )
-    cdbManager->SetDefaultStorage("local://$ALICE_ROOT");
+    cdbManager->SetDefaultStorage("local://$ALICE_ROOT/OCDB");
   
   AliCDBMetaData* cdbData = new AliCDBMetaData();
   cdbData->SetResponsible("Dimuon Offline project");
@@ -418,7 +418,7 @@ Bool_t AliMpCDB::WriteDDLStore(Bool_t readData)
 
   AliCDBManager* cdbManager = AliCDBManager::Instance();
   if ( ! cdbManager->GetDefaultStorage() )
-    cdbManager->SetDefaultStorage("local://$ALICE_ROOT");
+    cdbManager->SetDefaultStorage("local://$ALICE_ROOT/OCDB");
   
   AliCDBMetaData* cdbData = new AliCDBMetaData();
   cdbData->SetResponsible("Dimuon Offline project");
@@ -443,7 +443,7 @@ Bool_t AliMpCDB::WriteManuStore(Bool_t readData)
 
   AliCDBManager* cdbManager = AliCDBManager::Instance();
   if ( ! cdbManager->GetDefaultStorage() )
-    cdbManager->SetDefaultStorage("local://$ALICE_ROOT");
+    cdbManager->SetDefaultStorage("local://$ALICE_ROOT/OCDB");
   
   AliCDBMetaData* cdbData = new AliCDBMetaData();
   cdbData->SetResponsible("Dimuon Offline project");
diff --git a/MUON/mapping/AliMpCDB.h b/MUON/mapping/AliMpCDB.h
index 142b3313285..9410687e5e8 100644
--- a/MUON/mapping/AliMpCDB.h
+++ b/MUON/mapping/AliMpCDB.h
@@ -43,15 +43,15 @@ class AliMpCDB : public  TObject {
     static Bool_t LoadManuStore(Bool_t warn = false);
     
     static Bool_t LoadMpSegmentation2(
-                    const char* cdbpath = "local://$ALICE_ROOT",
+                    const char* cdbpath = "local://$ALICE_ROOT/OCDB",
                     Int_t runNumber = 0,
                     Bool_t warn = false);
     static Bool_t LoadDDLStore2(
-                    const char* cdbpath = "local://$ALICE_ROOT",
+                    const char* cdbpath = "local://$ALICE_ROOT/OCDB",
                     Int_t runNumber = 0,
                     Bool_t warn = false);
     static Bool_t LoadManuStore2(
-                    const char* cdbpath = "local://$ALICE_ROOT",
+                    const char* cdbpath = "local://$ALICE_ROOT/OCDB",
                     Int_t runNumber = 0,
                     Bool_t warn = false);
 
@@ -62,10 +62,10 @@ class AliMpCDB : public  TObject {
     static Bool_t WriteManuStore(Bool_t readData= true);
     
     static Bool_t GenerateMpData(
-                    const char* cdbpath = "local://$ALICE_ROOT",
+                    const char* cdbpath = "local://$ALICE_ROOT/OCDB",
                     Int_t runNumber = 0);
     static Bool_t GenerateMpRunData(
-                    const char* cdbpath = "local://$ALICE_ROOT",
+                    const char* cdbpath = "local://$ALICE_ROOT/OCDB",
                     Int_t runNumber = 0);
 
     // Switch loading
diff --git a/MUON/mchview.cxx b/MUON/mchview.cxx
index 405786df4f0..d28fce6fe95 100644
--- a/MUON/mchview.cxx
+++ b/MUON/mchview.cxx
@@ -101,7 +101,7 @@ int main(int argc, char** argv)
   
   AliWarningGeneral("main","FIXME ? Remove default storage and run number from here...");
   
-  AliCDBManager::Instance()->SetDefaultStorage("local://$ALICE_ROOT");
+  AliCDBManager::Instance()->SetDefaultStorage("local://$ALICE_ROOT/OCDB");
   AliCDBManager::Instance()->SetRun(0);
  
   gROOT->SetStyle("Plain");  
diff --git a/MUON/runDataReconstruction.C b/MUON/runDataReconstruction.C
index a6c8d91536c..f61b62785b0 100644
--- a/MUON/runDataReconstruction.C
+++ b/MUON/runDataReconstruction.C
@@ -42,7 +42,7 @@ TString ocdbPath = "alien://folder=/alice/data/2008/LHC08b/OCDB";
 
 // Data file, OCDB locally
 //TString input="$ALICE_ROOT/MUON/test_out.100/raw.root";
-//TString ocdbPath = "local://$ALICE_ROOT";
+//TString ocdbPath = "local://$ALICE_ROOT/OCDB";
 
 TString caliboption1 = "NOGAIN";
 TString caliboption2 = "GAINCONSTANTCAPA";
@@ -56,8 +56,8 @@ void runDataReconstruction(Int_t calib = 1)
   AliCDBManager* man = AliCDBManager::Instance();
   man->SetDefaultStorage(ocdbPath.Data());
 
-  man->SetSpecificStorage("MUON/Calib/Mapping","local://$ALICE_ROOT");
-  man->SetSpecificStorage("MUON/Calib/DDLStore","local://$ALICE_ROOT");
+  man->SetSpecificStorage("MUON/Calib/Mapping","local://$ALICE_ROOT/OCDB");
+  man->SetSpecificStorage("MUON/Calib/DDLStore","local://$ALICE_ROOT/OCDB");
   
   gRandom->SetSeed(seed);
   
diff --git a/MUON/runReconstruction.C b/MUON/runReconstruction.C
index a42ce7848f8..15455fd0d6d 100644
--- a/MUON/runReconstruction.C
+++ b/MUON/runReconstruction.C
@@ -37,7 +37,7 @@
 void runReconstruction(int seed, const char* input, const char* recoptions)
 { 
   AliCDBManager* man = AliCDBManager::Instance();
-  man->SetDefaultStorage("local://$ALICE_ROOT");
+  man->SetDefaultStorage("local://$ALICE_ROOT/OCDB");
   
   gRandom->SetSeed(seed);
   
diff --git a/MUON/runSimulation.C b/MUON/runSimulation.C
index 2185a77b29a..a120d274da4 100644
--- a/MUON/runSimulation.C
+++ b/MUON/runSimulation.C
@@ -34,8 +34,8 @@ void runSimulation(int seed, int nevents, const char* config)
 // Uncoment following lines to run simulation with local residual mis-alignment
 // (generated via MUONGenerateGeometryData.C macro)
 // AliCDBManager* man = AliCDBManager::Instance();
-// man->SetDefaultStorage("local://$ALICE_ROOT");
-// man->SetSpecificStorage("MUON/Align/Data","local://$ALICE_ROOT/MUON/ResMisAlignCDB");
+// man->SetDefaultStorage("local://$ALICE_ROOT/OCDB");
+// man->SetSpecificStorage("MUON/Align/Data","local://$ALICE_ROOT/OCDB/MUON/ResMisAlignCDB");
 
   AliSimulation MuonSim(config);
   MuonSim.SetSeed(seed);
diff --git a/ACORDE/Calib/Data/Run0_9999999_v0_s0.root b/OCDB/ACORDE/Calib/Data/Run0_9999999_v0_s0.root
similarity index 100%
rename from ACORDE/Calib/Data/Run0_9999999_v0_s0.root
rename to OCDB/ACORDE/Calib/Data/Run0_9999999_v0_s0.root
diff --git a/EMCAL/Align/Data/Run0_999999999_v0_s0.root b/OCDB/EMCAL/Align/Data/Run0_999999999_v0_s0.root
similarity index 100%
rename from EMCAL/Align/Data/Run0_999999999_v0_s0.root
rename to OCDB/EMCAL/Align/Data/Run0_999999999_v0_s0.root
diff --git a/EMCAL/Calib/AliEMCALCalibCoefs.cxx b/OCDB/EMCAL/Calib/AliEMCALCalibCoefs.cxx
similarity index 100%
rename from EMCAL/Calib/AliEMCALCalibCoefs.cxx
rename to OCDB/EMCAL/Calib/AliEMCALCalibCoefs.cxx
diff --git a/EMCAL/Calib/AliEMCALCalibCoefs.h b/OCDB/EMCAL/Calib/AliEMCALCalibCoefs.h
similarity index 100%
rename from EMCAL/Calib/AliEMCALCalibCoefs.h
rename to OCDB/EMCAL/Calib/AliEMCALCalibCoefs.h
diff --git a/EMCAL/Calib/AliEMCALCell.cxx b/OCDB/EMCAL/Calib/AliEMCALCell.cxx
similarity index 100%
rename from EMCAL/Calib/AliEMCALCell.cxx
rename to OCDB/EMCAL/Calib/AliEMCALCell.cxx
diff --git a/EMCAL/Calib/AliEMCALCell.h b/OCDB/EMCAL/Calib/AliEMCALCell.h
similarity index 100%
rename from EMCAL/Calib/AliEMCALCell.h
rename to OCDB/EMCAL/Calib/AliEMCALCell.h
diff --git a/EMCAL/Calib/AliEMCALCellInfo.cxx b/OCDB/EMCAL/Calib/AliEMCALCellInfo.cxx
similarity index 100%
rename from EMCAL/Calib/AliEMCALCellInfo.cxx
rename to OCDB/EMCAL/Calib/AliEMCALCellInfo.cxx
diff --git a/EMCAL/Calib/AliEMCALCellInfo.h b/OCDB/EMCAL/Calib/AliEMCALCellInfo.h
similarity index 100%
rename from EMCAL/Calib/AliEMCALCellInfo.h
rename to OCDB/EMCAL/Calib/AliEMCALCellInfo.h
diff --git a/EMCAL/Calib/AliEMCALFolder.cxx b/OCDB/EMCAL/Calib/AliEMCALFolder.cxx
similarity index 100%
rename from EMCAL/Calib/AliEMCALFolder.cxx
rename to OCDB/EMCAL/Calib/AliEMCALFolder.cxx
diff --git a/EMCAL/Calib/AliEMCALFolder.h b/OCDB/EMCAL/Calib/AliEMCALFolder.h
similarity index 100%
rename from EMCAL/Calib/AliEMCALFolder.h
rename to OCDB/EMCAL/Calib/AliEMCALFolder.h
diff --git a/EMCAL/Calib/AliEMCALPi0Calibration.cxx b/OCDB/EMCAL/Calib/AliEMCALPi0Calibration.cxx
similarity index 100%
rename from EMCAL/Calib/AliEMCALPi0Calibration.cxx
rename to OCDB/EMCAL/Calib/AliEMCALPi0Calibration.cxx
diff --git a/EMCAL/Calib/AliEMCALPi0Calibration.h b/OCDB/EMCAL/Calib/AliEMCALPi0Calibration.h
similarity index 100%
rename from EMCAL/Calib/AliEMCALPi0Calibration.h
rename to OCDB/EMCAL/Calib/AliEMCALPi0Calibration.h
diff --git a/EMCAL/Calib/AliEMCALPi0SelectionParam.cxx b/OCDB/EMCAL/Calib/AliEMCALPi0SelectionParam.cxx
similarity index 100%
rename from EMCAL/Calib/AliEMCALPi0SelectionParam.cxx
rename to OCDB/EMCAL/Calib/AliEMCALPi0SelectionParam.cxx
diff --git a/EMCAL/Calib/AliEMCALPi0SelectionParam.h b/OCDB/EMCAL/Calib/AliEMCALPi0SelectionParam.h
similarity index 100%
rename from EMCAL/Calib/AliEMCALPi0SelectionParam.h
rename to OCDB/EMCAL/Calib/AliEMCALPi0SelectionParam.h
diff --git a/EMCAL/Calib/AliEMCALSuperModule.cxx b/OCDB/EMCAL/Calib/AliEMCALSuperModule.cxx
similarity index 100%
rename from EMCAL/Calib/AliEMCALSuperModule.cxx
rename to OCDB/EMCAL/Calib/AliEMCALSuperModule.cxx
diff --git a/EMCAL/Calib/AliEMCALSuperModule.h b/OCDB/EMCAL/Calib/AliEMCALSuperModule.h
similarity index 100%
rename from EMCAL/Calib/AliEMCALSuperModule.h
rename to OCDB/EMCAL/Calib/AliEMCALSuperModule.h
diff --git a/EMCAL/Calib/Data/Run0_999999999_v0_s0.root b/OCDB/EMCAL/Calib/Data/Run0_999999999_v0_s0.root
similarity index 100%
rename from EMCAL/Calib/Data/Run0_999999999_v0_s0.root
rename to OCDB/EMCAL/Calib/Data/Run0_999999999_v0_s0.root
diff --git a/EMCAL/Calib/Mapping/Run0_999999999_v0_s0.root b/OCDB/EMCAL/Calib/Mapping/Run0_999999999_v0_s0.root
similarity index 100%
rename from EMCAL/Calib/Mapping/Run0_999999999_v0_s0.root
rename to OCDB/EMCAL/Calib/Mapping/Run0_999999999_v0_s0.root
diff --git a/EMCAL/Calib/RecoParam/Run0_999999999_v0_s0.root b/OCDB/EMCAL/Calib/RecoParam/Run0_999999999_v0_s0.root
similarity index 100%
rename from EMCAL/Calib/RecoParam/Run0_999999999_v0_s0.root
rename to OCDB/EMCAL/Calib/RecoParam/Run0_999999999_v0_s0.root
diff --git a/EMCAL/Config/Preprocessor/Run0_999999999_v0_s0.root b/OCDB/EMCAL/Config/Preprocessor/Run0_999999999_v0_s0.root
similarity index 100%
rename from EMCAL/Config/Preprocessor/Run0_999999999_v0_s0.root
rename to OCDB/EMCAL/Config/Preprocessor/Run0_999999999_v0_s0.root
diff --git a/EMCAL/Config/Temperature/Run0_999999999_v0_s0.root b/OCDB/EMCAL/Config/Temperature/Run0_999999999_v0_s0.root
similarity index 100%
rename from EMCAL/Config/Temperature/Run0_999999999_v0_s0.root
rename to OCDB/EMCAL/Config/Temperature/Run0_999999999_v0_s0.root
diff --git a/FMD/Align/Data/Run0_999999999_v0_s0.root b/OCDB/FMD/Align/Data/Run0_999999999_v0_s0.root
similarity index 100%
rename from FMD/Align/Data/Run0_999999999_v0_s0.root
rename to OCDB/FMD/Align/Data/Run0_999999999_v0_s0.root
diff --git a/FMD/Calib/AltroMap/Run0_999999_v0_s0.root b/OCDB/FMD/Calib/AltroMap/Run0_999999_v0_s0.root
similarity index 100%
rename from FMD/Calib/AltroMap/Run0_999999_v0_s0.root
rename to OCDB/FMD/Calib/AltroMap/Run0_999999_v0_s0.root
diff --git a/FMD/Calib/Dead/Run0_999999_v0_s0.root b/OCDB/FMD/Calib/Dead/Run0_999999_v0_s0.root
similarity index 100%
rename from FMD/Calib/Dead/Run0_999999_v0_s0.root
rename to OCDB/FMD/Calib/Dead/Run0_999999_v0_s0.root
diff --git a/FMD/Calib/Pedestal/Run0_999999_v0_s0.root b/OCDB/FMD/Calib/Pedestal/Run0_999999_v0_s0.root
similarity index 100%
rename from FMD/Calib/Pedestal/Run0_999999_v0_s0.root
rename to OCDB/FMD/Calib/Pedestal/Run0_999999_v0_s0.root
diff --git a/FMD/Calib/PulseGain/Run0_999999_v0_s0.root b/OCDB/FMD/Calib/PulseGain/Run0_999999_v0_s0.root
similarity index 100%
rename from FMD/Calib/PulseGain/Run0_999999_v0_s0.root
rename to OCDB/FMD/Calib/PulseGain/Run0_999999_v0_s0.root
diff --git a/FMD/Calib/SampleRate/Run0_999999_v0_s0.root b/OCDB/FMD/Calib/SampleRate/Run0_999999_v0_s0.root
similarity index 100%
rename from FMD/Calib/SampleRate/Run0_999999_v0_s0.root
rename to OCDB/FMD/Calib/SampleRate/Run0_999999_v0_s0.root
diff --git a/FMD/Calib/StripRange/Run0_999999_v0_s0.root b/OCDB/FMD/Calib/StripRange/Run0_999999_v0_s0.root
similarity index 100%
rename from FMD/Calib/StripRange/Run0_999999_v0_s0.root
rename to OCDB/FMD/Calib/StripRange/Run0_999999_v0_s0.root
diff --git a/FMD/Calib/ZeroSuppression/Run0_999999_v0_s0.root b/OCDB/FMD/Calib/ZeroSuppression/Run0_999999_v0_s0.root
similarity index 100%
rename from FMD/Calib/ZeroSuppression/Run0_999999_v0_s0.root
rename to OCDB/FMD/Calib/ZeroSuppression/Run0_999999_v0_s0.root
diff --git a/GRP/Align/Data/Run0_999999999_v0_s0.root b/OCDB/GRP/Align/Data/Run0_999999999_v0_s0.root
similarity index 100%
rename from GRP/Align/Data/Run0_999999999_v0_s0.root
rename to OCDB/GRP/Align/Data/Run0_999999999_v0_s0.root
diff --git a/GRP/CTP/Config/Run0_999999999_v0_s0.root b/OCDB/GRP/CTP/Config/Run0_999999999_v0_s0.root
similarity index 100%
rename from GRP/CTP/Config/Run0_999999999_v0_s0.root
rename to OCDB/GRP/CTP/Config/Run0_999999999_v0_s0.root
diff --git a/GRP/CTP/MUON.cfg b/OCDB/GRP/CTP/MUON.cfg
similarity index 100%
rename from GRP/CTP/MUON.cfg
rename to OCDB/GRP/CTP/MUON.cfg
diff --git a/GRP/CTP/Pb-Pb.cfg b/OCDB/GRP/CTP/Pb-Pb.cfg
similarity index 100%
rename from GRP/CTP/Pb-Pb.cfg
rename to OCDB/GRP/CTP/Pb-Pb.cfg
diff --git a/GRP/CTP/p-p.cfg b/OCDB/GRP/CTP/p-p.cfg
similarity index 100%
rename from GRP/CTP/p-p.cfg
rename to OCDB/GRP/CTP/p-p.cfg
diff --git a/GRP/CTP/run.cfg b/OCDB/GRP/CTP/run.cfg
similarity index 100%
rename from GRP/CTP/run.cfg
rename to OCDB/GRP/CTP/run.cfg
diff --git a/GRP/CTP/xcounters.txt b/OCDB/GRP/CTP/xcounters.txt
similarity index 100%
rename from GRP/CTP/xcounters.txt
rename to OCDB/GRP/CTP/xcounters.txt
diff --git a/GRP/Calib/MeanVertex/Run0_999999999_v0_s0.root b/OCDB/GRP/Calib/MeanVertex/Run0_999999999_v0_s0.root
similarity index 100%
rename from GRP/Calib/MeanVertex/Run0_999999999_v0_s0.root
rename to OCDB/GRP/Calib/MeanVertex/Run0_999999999_v0_s0.root
diff --git a/GRP/Calib/MeanVertexTPC/Run0_999999999_v0_s0.root b/OCDB/GRP/Calib/MeanVertexTPC/Run0_999999999_v0_s0.root
similarity index 100%
rename from GRP/Calib/MeanVertexTPC/Run0_999999999_v0_s0.root
rename to OCDB/GRP/Calib/MeanVertexTPC/Run0_999999999_v0_s0.root
diff --git a/GRP/GRP/Data/Run0_999999999_v0_s0.root b/OCDB/GRP/GRP/Data/Run0_999999999_v0_s0.root
similarity index 100%
rename from GRP/GRP/Data/Run0_999999999_v0_s0.root
rename to OCDB/GRP/GRP/Data/Run0_999999999_v0_s0.root
diff --git a/GRP/Geometry/Data/Run0_999999999_v0_s0.root b/OCDB/GRP/Geometry/Data/Run0_999999999_v0_s0.root
similarity index 100%
rename from GRP/Geometry/Data/Run0_999999999_v0_s0.root
rename to OCDB/GRP/Geometry/Data/Run0_999999999_v0_s0.root
diff --git a/HLT/ConfigHLT/SolenoidBz/Run0_0_v0_s0.root b/OCDB/HLT/ConfigHLT/SolenoidBz/Run0_0_v0_s0.root
similarity index 100%
rename from HLT/ConfigHLT/SolenoidBz/Run0_0_v0_s0.root
rename to OCDB/HLT/ConfigHLT/SolenoidBz/Run0_0_v0_s0.root
diff --git a/HLT/ConfigMUON/DecisionComponent/Run0_999999999_v0_s0.root b/OCDB/HLT/ConfigMUON/DecisionComponent/Run0_999999999_v0_s0.root
similarity index 100%
rename from HLT/ConfigMUON/DecisionComponent/Run0_999999999_v0_s0.root
rename to OCDB/HLT/ConfigMUON/DecisionComponent/Run0_999999999_v0_s0.root
diff --git a/HLT/ConfigMUON/HitReconstructor/Run0_999999999_v0_s0.root b/OCDB/HLT/ConfigMUON/HitReconstructor/Run0_999999999_v0_s0.root
similarity index 100%
rename from HLT/ConfigMUON/HitReconstructor/Run0_999999999_v0_s0.root
rename to OCDB/HLT/ConfigMUON/HitReconstructor/Run0_999999999_v0_s0.root
diff --git a/HLT/ConfigMUON/MansoTrackerFSM/Run0_999999999_v0_s0.root b/OCDB/HLT/ConfigMUON/MansoTrackerFSM/Run0_999999999_v0_s0.root
similarity index 100%
rename from HLT/ConfigMUON/MansoTrackerFSM/Run0_999999999_v0_s0.root
rename to OCDB/HLT/ConfigMUON/MansoTrackerFSM/Run0_999999999_v0_s0.root
diff --git a/HLT/ConfigMUON/TriggerReconstructor/Run0_999999999_v0_s0.root b/OCDB/HLT/ConfigMUON/TriggerReconstructor/Run0_999999999_v0_s0.root
similarity index 100%
rename from HLT/ConfigMUON/TriggerReconstructor/Run0_999999999_v0_s0.root
rename to OCDB/HLT/ConfigMUON/TriggerReconstructor/Run0_999999999_v0_s0.root
diff --git a/HMPID/Align/Data/Run0_999999999_v0_s0.root b/OCDB/HMPID/Align/Data/Run0_999999999_v0_s0.root
similarity index 100%
rename from HMPID/Align/Data/Run0_999999999_v0_s0.root
rename to OCDB/HMPID/Align/Data/Run0_999999999_v0_s0.root
diff --git a/HMPID/Calib/DaqSig/Run0_999999999_v0_s0.root b/OCDB/HMPID/Calib/DaqSig/Run0_999999999_v0_s0.root
similarity index 100%
rename from HMPID/Calib/DaqSig/Run0_999999999_v0_s0.root
rename to OCDB/HMPID/Calib/DaqSig/Run0_999999999_v0_s0.root
diff --git a/HMPID/Calib/Nmean/Run0_999999999_v0_s0.root b/OCDB/HMPID/Calib/Nmean/Run0_999999999_v0_s0.root
similarity index 100%
rename from HMPID/Calib/Nmean/Run0_999999999_v0_s0.root
rename to OCDB/HMPID/Calib/Nmean/Run0_999999999_v0_s0.root
diff --git a/HMPID/Calib/Qthre/Run0_999999999_v0_s0.root b/OCDB/HMPID/Calib/Qthre/Run0_999999999_v0_s0.root
similarity index 100%
rename from HMPID/Calib/Qthre/Run0_999999999_v0_s0.root
rename to OCDB/HMPID/Calib/Qthre/Run0_999999999_v0_s0.root
diff --git a/ITS/Align/Data/Run0_999999999_v0_s0.root b/OCDB/ITS/Align/Data/Run0_999999999_v0_s0.root
similarity index 100%
rename from ITS/Align/Data/Run0_999999999_v0_s0.root
rename to OCDB/ITS/Align/Data/Run0_999999999_v0_s0.root
diff --git a/ITS/Calib/BadChannelsSSD/Run0_999999999_v0_s0.root b/OCDB/ITS/Calib/BadChannelsSSD/Run0_999999999_v0_s0.root
similarity index 100%
rename from ITS/Calib/BadChannelsSSD/Run0_999999999_v0_s0.root
rename to OCDB/ITS/Calib/BadChannelsSSD/Run0_999999999_v0_s0.root
diff --git a/ITS/Calib/CalibSDD/Run0_9999999_v0_s0.root b/OCDB/ITS/Calib/CalibSDD/Run0_9999999_v0_s0.root
similarity index 100%
rename from ITS/Calib/CalibSDD/Run0_9999999_v0_s0.root
rename to OCDB/ITS/Calib/CalibSDD/Run0_9999999_v0_s0.root
diff --git a/ITS/Calib/DDLMapSDD/Run0_9999999_v0_s0.root b/OCDB/ITS/Calib/DDLMapSDD/Run0_9999999_v0_s0.root
similarity index 100%
rename from ITS/Calib/DDLMapSDD/Run0_9999999_v0_s0.root
rename to OCDB/ITS/Calib/DDLMapSDD/Run0_9999999_v0_s0.root
diff --git a/ITS/Calib/DriftSpeedSDD/Run0_9999999_v0_s0.root b/OCDB/ITS/Calib/DriftSpeedSDD/Run0_9999999_v0_s0.root
similarity index 100%
rename from ITS/Calib/DriftSpeedSDD/Run0_9999999_v0_s0.root
rename to OCDB/ITS/Calib/DriftSpeedSDD/Run0_9999999_v0_s0.root
diff --git a/ITS/Calib/GainSSD/Run0_999999999_v0_s0.root b/OCDB/ITS/Calib/GainSSD/Run0_999999999_v0_s0.root
similarity index 100%
rename from ITS/Calib/GainSSD/Run0_999999999_v0_s0.root
rename to OCDB/ITS/Calib/GainSSD/Run0_999999999_v0_s0.root
diff --git a/ITS/Calib/HLTforSDD/Run0_9999999_v0_s0.root b/OCDB/ITS/Calib/HLTforSDD/Run0_9999999_v0_s0.root
similarity index 100%
rename from ITS/Calib/HLTforSDD/Run0_9999999_v0_s0.root
rename to OCDB/ITS/Calib/HLTforSDD/Run0_9999999_v0_s0.root
diff --git a/ITS/Calib/MapsTimeSDD/Run0_9999999_v0_s0.root b/OCDB/ITS/Calib/MapsTimeSDD/Run0_9999999_v0_s0.root
similarity index 100%
rename from ITS/Calib/MapsTimeSDD/Run0_9999999_v0_s0.root
rename to OCDB/ITS/Calib/MapsTimeSDD/Run0_9999999_v0_s0.root
diff --git a/ITS/Calib/NoiseSSD/Run0_999999999_v0_s0.root b/OCDB/ITS/Calib/NoiseSSD/Run0_999999999_v0_s0.root
similarity index 100%
rename from ITS/Calib/NoiseSSD/Run0_999999999_v0_s0.root
rename to OCDB/ITS/Calib/NoiseSSD/Run0_999999999_v0_s0.root
diff --git a/ITS/Calib/RecoParam/Run0_999999999_v0_s0.root b/OCDB/ITS/Calib/RecoParam/Run0_999999999_v0_s0.root
similarity index 100%
rename from ITS/Calib/RecoParam/Run0_999999999_v0_s0.root
rename to OCDB/ITS/Calib/RecoParam/Run0_999999999_v0_s0.root
diff --git a/ITS/Calib/RespSDD/Run0_999999999_v0_s0.root b/OCDB/ITS/Calib/RespSDD/Run0_999999999_v0_s0.root
similarity index 100%
rename from ITS/Calib/RespSDD/Run0_999999999_v0_s0.root
rename to OCDB/ITS/Calib/RespSDD/Run0_999999999_v0_s0.root
diff --git a/ITS/Calib/SPDDead/Run0_9999999_v0_s0.root b/OCDB/ITS/Calib/SPDDead/Run0_9999999_v0_s0.root
similarity index 100%
rename from ITS/Calib/SPDDead/Run0_9999999_v0_s0.root
rename to OCDB/ITS/Calib/SPDDead/Run0_9999999_v0_s0.root
diff --git a/ITS/Calib/SPDFastOr/Run0_9999999_v0_s0.root b/OCDB/ITS/Calib/SPDFastOr/Run0_9999999_v0_s0.root
similarity index 100%
rename from ITS/Calib/SPDFastOr/Run0_9999999_v0_s0.root
rename to OCDB/ITS/Calib/SPDFastOr/Run0_9999999_v0_s0.root
diff --git a/ITS/Calib/SPDNoisy/Run0_9999999_v0_s0.root b/OCDB/ITS/Calib/SPDNoisy/Run0_9999999_v0_s0.root
similarity index 100%
rename from ITS/Calib/SPDNoisy/Run0_9999999_v0_s0.root
rename to OCDB/ITS/Calib/SPDNoisy/Run0_9999999_v0_s0.root
diff --git a/ITS/PlaneEff/PlaneEffSDD/Run0_999999999_v0_s0.root b/OCDB/ITS/PlaneEff/PlaneEffSDD/Run0_999999999_v0_s0.root
similarity index 100%
rename from ITS/PlaneEff/PlaneEffSDD/Run0_999999999_v0_s0.root
rename to OCDB/ITS/PlaneEff/PlaneEffSDD/Run0_999999999_v0_s0.root
diff --git a/ITS/PlaneEff/PlaneEffSPD/Run0_999999999_v0_s0.root b/OCDB/ITS/PlaneEff/PlaneEffSPD/Run0_999999999_v0_s0.root
similarity index 100%
rename from ITS/PlaneEff/PlaneEffSPD/Run0_999999999_v0_s0.root
rename to OCDB/ITS/PlaneEff/PlaneEffSPD/Run0_999999999_v0_s0.root
diff --git a/ITS/PlaneEff/PlaneEffSSD/Run0_999999999_v0_s0.root b/OCDB/ITS/PlaneEff/PlaneEffSSD/Run0_999999999_v0_s0.root
similarity index 100%
rename from ITS/PlaneEff/PlaneEffSSD/Run0_999999999_v0_s0.root
rename to OCDB/ITS/PlaneEff/PlaneEffSSD/Run0_999999999_v0_s0.root
diff --git a/MUON/Align/Data/Run0_999999999_v0_s0.root b/OCDB/MUON/Align/Data/Run0_999999999_v0_s0.root
similarity index 100%
rename from MUON/Align/Data/Run0_999999999_v0_s0.root
rename to OCDB/MUON/Align/Data/Run0_999999999_v0_s0.root
diff --git a/MUON/Calib/Capacitances/Run0_999999999_v0_s0.root b/OCDB/MUON/Calib/Capacitances/Run0_999999999_v0_s0.root
similarity index 100%
rename from MUON/Calib/Capacitances/Run0_999999999_v0_s0.root
rename to OCDB/MUON/Calib/Capacitances/Run0_999999999_v0_s0.root
diff --git a/MUON/Calib/DDLStore/Run0_999999999_v0_s0.root b/OCDB/MUON/Calib/DDLStore/Run0_999999999_v0_s0.root
similarity index 100%
rename from MUON/Calib/DDLStore/Run0_999999999_v0_s0.root
rename to OCDB/MUON/Calib/DDLStore/Run0_999999999_v0_s0.root
diff --git a/MUON/Calib/Gains/Run0_999999999_v0_s0.root b/OCDB/MUON/Calib/Gains/Run0_999999999_v0_s0.root
similarity index 100%
rename from MUON/Calib/Gains/Run0_999999999_v0_s0.root
rename to OCDB/MUON/Calib/Gains/Run0_999999999_v0_s0.root
diff --git a/MUON/Calib/GlobalTriggerBoardMasks/Run0_999999999_v0_s0.root b/OCDB/MUON/Calib/GlobalTriggerBoardMasks/Run0_999999999_v0_s0.root
similarity index 100%
rename from MUON/Calib/GlobalTriggerBoardMasks/Run0_999999999_v0_s0.root
rename to OCDB/MUON/Calib/GlobalTriggerBoardMasks/Run0_999999999_v0_s0.root
diff --git a/MUON/Calib/GlobalTriggerCrateConfig/Run0_999999999_v0_s0.root b/OCDB/MUON/Calib/GlobalTriggerCrateConfig/Run0_999999999_v0_s0.root
similarity index 100%
rename from MUON/Calib/GlobalTriggerCrateConfig/Run0_999999999_v0_s0.root
rename to OCDB/MUON/Calib/GlobalTriggerCrateConfig/Run0_999999999_v0_s0.root
diff --git a/MUON/Calib/HV/Run0_999999999_v0_s0.root b/OCDB/MUON/Calib/HV/Run0_999999999_v0_s0.root
similarity index 100%
rename from MUON/Calib/HV/Run0_999999999_v0_s0.root
rename to OCDB/MUON/Calib/HV/Run0_999999999_v0_s0.root
diff --git a/MUON/Calib/LocalTriggerBoardMasks/Run0_999999999_v0_s0.root b/OCDB/MUON/Calib/LocalTriggerBoardMasks/Run0_999999999_v0_s0.root
similarity index 100%
rename from MUON/Calib/LocalTriggerBoardMasks/Run0_999999999_v0_s0.root
rename to OCDB/MUON/Calib/LocalTriggerBoardMasks/Run0_999999999_v0_s0.root
diff --git a/MUON/Calib/Mapping/Run0_999999999_v0_s0.root b/OCDB/MUON/Calib/Mapping/Run0_999999999_v0_s0.root
similarity index 100%
rename from MUON/Calib/Mapping/Run0_999999999_v0_s0.root
rename to OCDB/MUON/Calib/Mapping/Run0_999999999_v0_s0.root
diff --git a/MUON/Calib/MappingData/Run0_999999999_v0_s0.root b/OCDB/MUON/Calib/MappingData/Run0_999999999_v0_s0.root
similarity index 100%
rename from MUON/Calib/MappingData/Run0_999999999_v0_s0.root
rename to OCDB/MUON/Calib/MappingData/Run0_999999999_v0_s0.root
diff --git a/MUON/Calib/MappingRunData/Run0_999999999_v0_s0.root b/OCDB/MUON/Calib/MappingRunData/Run0_999999999_v0_s0.root
similarity index 100%
rename from MUON/Calib/MappingRunData/Run0_999999999_v0_s0.root
rename to OCDB/MUON/Calib/MappingRunData/Run0_999999999_v0_s0.root
diff --git a/MUON/Calib/Neighbours/Run0_999999999_v0_s0.root b/OCDB/MUON/Calib/Neighbours/Run0_999999999_v0_s0.root
similarity index 100%
rename from MUON/Calib/Neighbours/Run0_999999999_v0_s0.root
rename to OCDB/MUON/Calib/Neighbours/Run0_999999999_v0_s0.root
diff --git a/MUON/Calib/Pedestals/Run0_999999999_v0_s0.root b/OCDB/MUON/Calib/Pedestals/Run0_999999999_v0_s0.root
similarity index 100%
rename from MUON/Calib/Pedestals/Run0_999999999_v0_s0.root
rename to OCDB/MUON/Calib/Pedestals/Run0_999999999_v0_s0.root
diff --git a/MUON/Calib/RecoParam/Run0_999999999_v0_s0.root b/OCDB/MUON/Calib/RecoParam/Run0_999999999_v0_s0.root
similarity index 100%
rename from MUON/Calib/RecoParam/Run0_999999999_v0_s0.root
rename to OCDB/MUON/Calib/RecoParam/Run0_999999999_v0_s0.root
diff --git a/MUON/Calib/RegionalTriggerBoardMasks/Run0_999999999_v0_s0.root b/OCDB/MUON/Calib/RegionalTriggerBoardMasks/Run0_999999999_v0_s0.root
similarity index 100%
rename from MUON/Calib/RegionalTriggerBoardMasks/Run0_999999999_v0_s0.root
rename to OCDB/MUON/Calib/RegionalTriggerBoardMasks/Run0_999999999_v0_s0.root
diff --git a/MUON/Calib/RegionalTriggerConfig/Run0_999999999_v0_s0.root b/OCDB/MUON/Calib/RegionalTriggerConfig/Run0_999999999_v0_s0.root
similarity index 100%
rename from MUON/Calib/RegionalTriggerConfig/Run0_999999999_v0_s0.root
rename to OCDB/MUON/Calib/RegionalTriggerConfig/Run0_999999999_v0_s0.root
diff --git a/MUON/Calib/TriggerDCS/Run0_999999999_v0_s0.root b/OCDB/MUON/Calib/TriggerDCS/Run0_999999999_v0_s0.root
similarity index 100%
rename from MUON/Calib/TriggerDCS/Run0_999999999_v0_s0.root
rename to OCDB/MUON/Calib/TriggerDCS/Run0_999999999_v0_s0.root
diff --git a/MUON/Calib/TriggerEfficiency/Run0_999999999_v0_s0.root b/OCDB/MUON/Calib/TriggerEfficiency/Run0_999999999_v0_s0.root
similarity index 100%
rename from MUON/Calib/TriggerEfficiency/Run0_999999999_v0_s0.root
rename to OCDB/MUON/Calib/TriggerEfficiency/Run0_999999999_v0_s0.root
diff --git a/MUON/Calib/TriggerLut/Run0_999999999_v0_s0.root b/OCDB/MUON/Calib/TriggerLut/Run0_999999999_v0_s0.root
similarity index 100%
rename from MUON/Calib/TriggerLut/Run0_999999999_v0_s0.root
rename to OCDB/MUON/Calib/TriggerLut/Run0_999999999_v0_s0.root
diff --git a/MUON/Calib/TriggerLut/Run0_999999999_v1_s0.root b/OCDB/MUON/Calib/TriggerLut/Run0_999999999_v1_s0.root
similarity index 100%
rename from MUON/Calib/TriggerLut/Run0_999999999_v1_s0.root
rename to OCDB/MUON/Calib/TriggerLut/Run0_999999999_v1_s0.root
diff --git a/PHOS/Align/Data/README b/OCDB/PHOS/Align/Data/README
similarity index 100%
rename from PHOS/Align/Data/README
rename to OCDB/PHOS/Align/Data/README
diff --git a/PHOS/Align/Data/Run0_999999999_v0_s0.root b/OCDB/PHOS/Align/Data/Run0_999999999_v0_s0.root
similarity index 100%
rename from PHOS/Align/Data/Run0_999999999_v0_s0.root
rename to OCDB/PHOS/Align/Data/Run0_999999999_v0_s0.root
diff --git a/PHOS/Calib/CpvGainPedestals/Run0_999999_v0_s0.root b/OCDB/PHOS/Calib/CpvGainPedestals/Run0_999999_v0_s0.root
similarity index 100%
rename from PHOS/Calib/CpvGainPedestals/Run0_999999_v0_s0.root
rename to OCDB/PHOS/Calib/CpvGainPedestals/Run0_999999_v0_s0.root
diff --git a/PHOS/Calib/EmcBadChannels/Run0_999999_v0_s0.root b/OCDB/PHOS/Calib/EmcBadChannels/Run0_999999_v0_s0.root
similarity index 100%
rename from PHOS/Calib/EmcBadChannels/Run0_999999_v0_s0.root
rename to OCDB/PHOS/Calib/EmcBadChannels/Run0_999999_v0_s0.root
diff --git a/PHOS/Calib/EmcGainPedestals/Run0_999999_v0_s0.root b/OCDB/PHOS/Calib/EmcGainPedestals/Run0_999999_v0_s0.root
similarity index 100%
rename from PHOS/Calib/EmcGainPedestals/Run0_999999_v0_s0.root
rename to OCDB/PHOS/Calib/EmcGainPedestals/Run0_999999_v0_s0.root
diff --git a/PHOS/Calib/Mapping/Run0_999999999_v0_s0.root b/OCDB/PHOS/Calib/Mapping/Run0_999999999_v0_s0.root
similarity index 100%
rename from PHOS/Calib/Mapping/Run0_999999999_v0_s0.root
rename to OCDB/PHOS/Calib/Mapping/Run0_999999999_v0_s0.root
diff --git a/PHOS/Calib/RecoParam/Run0_999999999_v0_s0.root b/OCDB/PHOS/Calib/RecoParam/Run0_999999999_v0_s0.root
similarity index 100%
rename from PHOS/Calib/RecoParam/Run0_999999999_v0_s0.root
rename to OCDB/PHOS/Calib/RecoParam/Run0_999999999_v0_s0.root
diff --git a/PMD/Align/Data/Run0_999999999_v0_s0.root b/OCDB/PMD/Align/Data/Run0_999999999_v0_s0.root
similarity index 100%
rename from PMD/Align/Data/Run0_999999999_v0_s0.root
rename to OCDB/PMD/Align/Data/Run0_999999999_v0_s0.root
diff --git a/PMD/Calib/Gain/Run0_999999999_v0_s0.root b/OCDB/PMD/Calib/Gain/Run0_999999999_v0_s0.root
similarity index 100%
rename from PMD/Calib/Gain/Run0_999999999_v0_s0.root
rename to OCDB/PMD/Calib/Gain/Run0_999999999_v0_s0.root
diff --git a/PMD/Calib/Ped/Run0_999999999_v0_s0.root b/OCDB/PMD/Calib/Ped/Run0_999999999_v0_s0.root
similarity index 100%
rename from PMD/Calib/Ped/Run0_999999999_v0_s0.root
rename to OCDB/PMD/Calib/Ped/Run0_999999999_v0_s0.root
diff --git a/T0/Align/Data/Run0_999999999_v0_s0.root b/OCDB/T0/Align/Data/Run0_999999999_v0_s0.root
similarity index 100%
rename from T0/Align/Data/Run0_999999999_v0_s0.root
rename to OCDB/T0/Align/Data/Run0_999999999_v0_s0.root
diff --git a/T0/Align/Data/T0SurveyMisalignment.root b/OCDB/T0/Align/Data/T0SurveyMisalignment.root
similarity index 100%
rename from T0/Align/Data/T0SurveyMisalignment.root
rename to OCDB/T0/Align/Data/T0SurveyMisalignment.root
diff --git a/T0/Calib/Gain_TimeDelay_Slewing_Walk/Run0_999999999_v0_s0.root b/OCDB/T0/Calib/Gain_TimeDelay_Slewing_Walk/Run0_999999999_v0_s0.root
similarity index 100%
rename from T0/Calib/Gain_TimeDelay_Slewing_Walk/Run0_999999999_v0_s0.root
rename to OCDB/T0/Calib/Gain_TimeDelay_Slewing_Walk/Run0_999999999_v0_s0.root
diff --git a/T0/Calib/LookUp_Table/Run0_10_v0_s0.root b/OCDB/T0/Calib/LookUp_Table/Run0_10_v0_s0.root
similarity index 100%
rename from T0/Calib/LookUp_Table/Run0_10_v0_s0.root
rename to OCDB/T0/Calib/LookUp_Table/Run0_10_v0_s0.root
diff --git a/T0/Calib/LookUp_Table/Run0_9999999_v0_s1.root b/OCDB/T0/Calib/LookUp_Table/Run0_9999999_v0_s1.root
similarity index 100%
rename from T0/Calib/LookUp_Table/Run0_9999999_v0_s1.root
rename to OCDB/T0/Calib/LookUp_Table/Run0_9999999_v0_s1.root
diff --git a/T0/Calib/Slewing_Walk/Run0_999999_v0_s0.root b/OCDB/T0/Calib/Slewing_Walk/Run0_999999_v0_s0.root
similarity index 100%
rename from T0/Calib/Slewing_Walk/Run0_999999_v0_s0.root
rename to OCDB/T0/Calib/Slewing_Walk/Run0_999999_v0_s0.root
diff --git a/T0/Calib/TimeDelay/Run0_999999_v0_s0.root b/OCDB/T0/Calib/TimeDelay/Run0_999999_v0_s0.root
similarity index 100%
rename from T0/Calib/TimeDelay/Run0_999999_v0_s0.root
rename to OCDB/T0/Calib/TimeDelay/Run0_999999_v0_s0.root
diff --git a/TOF/Align/Data/Run0_999999999_v0_s0.root b/OCDB/TOF/Align/Data/Run0_999999999_v0_s0.root
similarity index 100%
rename from TOF/Align/Data/Run0_999999999_v0_s0.root
rename to OCDB/TOF/Align/Data/Run0_999999999_v0_s0.root
diff --git a/TOF/Calib/Config/Run0_999999999_v0_s0.root b/OCDB/TOF/Calib/Config/Run0_999999999_v0_s0.root
similarity index 100%
rename from TOF/Calib/Config/Run0_999999999_v0_s0.root
rename to OCDB/TOF/Calib/Config/Run0_999999999_v0_s0.root
diff --git a/TOF/Calib/DCSData/Run0_999999999_v0_s0.root b/OCDB/TOF/Calib/DCSData/Run0_999999999_v0_s0.root
similarity index 100%
rename from TOF/Calib/DCSData/Run0_999999999_v0_s0.root
rename to OCDB/TOF/Calib/DCSData/Run0_999999999_v0_s0.root
diff --git a/TOF/Calib/HW/Run0_999999999_v0_s0.root b/OCDB/TOF/Calib/HW/Run0_999999999_v0_s0.root
similarity index 100%
rename from TOF/Calib/HW/Run0_999999999_v0_s0.root
rename to OCDB/TOF/Calib/HW/Run0_999999999_v0_s0.root
diff --git a/TOF/Calib/Noise/Run0_999999999_v0_s0.root b/OCDB/TOF/Calib/Noise/Run0_999999999_v0_s0.root
similarity index 100%
rename from TOF/Calib/Noise/Run0_999999999_v0_s0.root
rename to OCDB/TOF/Calib/Noise/Run0_999999999_v0_s0.root
diff --git a/TOF/Calib/ParOffline/Run0_999999999_v0_s0.root b/OCDB/TOF/Calib/ParOffline/Run0_999999999_v0_s0.root
similarity index 100%
rename from TOF/Calib/ParOffline/Run0_999999999_v0_s0.root
rename to OCDB/TOF/Calib/ParOffline/Run0_999999999_v0_s0.root
diff --git a/TOF/Calib/ParOnline/Run0_999999999_v0_s0.root b/OCDB/TOF/Calib/ParOnline/Run0_999999999_v0_s0.root
similarity index 100%
rename from TOF/Calib/ParOnline/Run0_999999999_v0_s0.root
rename to OCDB/TOF/Calib/ParOnline/Run0_999999999_v0_s0.root
diff --git a/TOF/Calib/ParOnlineDelay/Run0_999999999_v0_s0.root b/OCDB/TOF/Calib/ParOnlineDelay/Run0_999999999_v0_s0.root
similarity index 100%
rename from TOF/Calib/ParOnlineDelay/Run0_999999999_v0_s0.root
rename to OCDB/TOF/Calib/ParOnlineDelay/Run0_999999999_v0_s0.root
diff --git a/TOF/Calib/Pulser/Run0_999999999_v0_s0.root b/OCDB/TOF/Calib/Pulser/Run0_999999999_v0_s0.root
similarity index 100%
rename from TOF/Calib/Pulser/Run0_999999999_v0_s0.root
rename to OCDB/TOF/Calib/Pulser/Run0_999999999_v0_s0.root
diff --git a/TOF/Calib/RecPar/Run0_999999999_v0_s0.root b/OCDB/TOF/Calib/RecPar/Run0_999999999_v0_s0.root
similarity index 100%
rename from TOF/Calib/RecPar/Run0_999999999_v0_s0.root
rename to OCDB/TOF/Calib/RecPar/Run0_999999999_v0_s0.root
diff --git a/TOF/Calib/RecoParam/Run0_999999999_v0_s0.root b/OCDB/TOF/Calib/RecoParam/Run0_999999999_v0_s0.root
similarity index 100%
rename from TOF/Calib/RecoParam/Run0_999999999_v0_s0.root
rename to OCDB/TOF/Calib/RecoParam/Run0_999999999_v0_s0.root
diff --git a/TOF/Calib/SimHisto/Run0_999999999_v0_s0.root b/OCDB/TOF/Calib/SimHisto/Run0_999999999_v0_s0.root
similarity index 100%
rename from TOF/Calib/SimHisto/Run0_999999999_v0_s0.root
rename to OCDB/TOF/Calib/SimHisto/Run0_999999999_v0_s0.root
diff --git a/TOF/Calib/Status/Run0_999999999_v0_s0.root b/OCDB/TOF/Calib/Status/Run0_999999999_v0_s0.root
similarity index 100%
rename from TOF/Calib/Status/Run0_999999999_v0_s0.root
rename to OCDB/TOF/Calib/Status/Run0_999999999_v0_s0.root
diff --git a/TPC/Align/Data/Run0_999999999_v0_s0.root b/OCDB/TPC/Align/Data/Run0_999999999_v0_s0.root
similarity index 100%
rename from TPC/Align/Data/Run0_999999999_v0_s0.root
rename to OCDB/TPC/Align/Data/Run0_999999999_v0_s0.root
diff --git a/TPC/Calib/ClusterParam/Run0_999999999_v0_s0.root b/OCDB/TPC/Calib/ClusterParam/Run0_999999999_v0_s0.root
similarity index 100%
rename from TPC/Calib/ClusterParam/Run0_999999999_v0_s0.root
rename to OCDB/TPC/Calib/ClusterParam/Run0_999999999_v0_s0.root
diff --git a/TPC/Calib/ClusterParam/Run0_999999999_v0_s2.root b/OCDB/TPC/Calib/ClusterParam/Run0_999999999_v0_s2.root
similarity index 100%
rename from TPC/Calib/ClusterParam/Run0_999999999_v0_s2.root
rename to OCDB/TPC/Calib/ClusterParam/Run0_999999999_v0_s2.root
diff --git a/TPC/Calib/GainFactorDedx/Run0_999999999_v0_s0.root b/OCDB/TPC/Calib/GainFactorDedx/Run0_999999999_v0_s0.root
similarity index 100%
rename from TPC/Calib/GainFactorDedx/Run0_999999999_v0_s0.root
rename to OCDB/TPC/Calib/GainFactorDedx/Run0_999999999_v0_s0.root
diff --git a/TPC/Calib/LaserTracks.root b/OCDB/TPC/Calib/LaserTracks.root
similarity index 100%
rename from TPC/Calib/LaserTracks.root
rename to OCDB/TPC/Calib/LaserTracks.root
diff --git a/TPC/Calib/MapCalibrationObjects.root b/OCDB/TPC/Calib/MapCalibrationObjects.root
similarity index 100%
rename from TPC/Calib/MapCalibrationObjects.root
rename to OCDB/TPC/Calib/MapCalibrationObjects.root
diff --git a/TPC/Calib/Mapping/Run0_999999999_v0_s0.root b/OCDB/TPC/Calib/Mapping/Run0_999999999_v0_s0.root
similarity index 100%
rename from TPC/Calib/Mapping/Run0_999999999_v0_s0.root
rename to OCDB/TPC/Calib/Mapping/Run0_999999999_v0_s0.root
diff --git a/TPC/Calib/PadGainFactor/Run0_999999999_v0_s1.root b/OCDB/TPC/Calib/PadGainFactor/Run0_999999999_v0_s1.root
similarity index 100%
rename from TPC/Calib/PadGainFactor/Run0_999999999_v0_s1.root
rename to OCDB/TPC/Calib/PadGainFactor/Run0_999999999_v0_s1.root
diff --git a/TPC/Calib/PadGainFactor/Run0_999999999_v0_s2.root b/OCDB/TPC/Calib/PadGainFactor/Run0_999999999_v0_s2.root
similarity index 100%
rename from TPC/Calib/PadGainFactor/Run0_999999999_v0_s2.root
rename to OCDB/TPC/Calib/PadGainFactor/Run0_999999999_v0_s2.root
diff --git a/TPC/Calib/PadNoise/Run0_999999999_v0_s1.root b/OCDB/TPC/Calib/PadNoise/Run0_999999999_v0_s1.root
similarity index 100%
rename from TPC/Calib/PadNoise/Run0_999999999_v0_s1.root
rename to OCDB/TPC/Calib/PadNoise/Run0_999999999_v0_s1.root
diff --git a/TPC/Calib/PadTime0/Run0_999999999_v0_s1.root b/OCDB/TPC/Calib/PadTime0/Run0_999999999_v0_s1.root
similarity index 100%
rename from TPC/Calib/PadTime0/Run0_999999999_v0_s1.root
rename to OCDB/TPC/Calib/PadTime0/Run0_999999999_v0_s1.root
diff --git a/TPC/Calib/PadTime0/Run0_999999999_v0_s3.root b/OCDB/TPC/Calib/PadTime0/Run0_999999999_v0_s3.root
similarity index 100%
rename from TPC/Calib/PadTime0/Run0_999999999_v0_s3.root
rename to OCDB/TPC/Calib/PadTime0/Run0_999999999_v0_s3.root
diff --git a/TPC/Calib/Parameters/Run0_999999999_v0_s1.root b/OCDB/TPC/Calib/Parameters/Run0_999999999_v0_s1.root
similarity index 100%
rename from TPC/Calib/Parameters/Run0_999999999_v0_s1.root
rename to OCDB/TPC/Calib/Parameters/Run0_999999999_v0_s1.root
diff --git a/TPC/Calib/Parameters/Run0_999999999_v0_s2.root b/OCDB/TPC/Calib/Parameters/Run0_999999999_v0_s2.root
similarity index 100%
rename from TPC/Calib/Parameters/Run0_999999999_v0_s2.root
rename to OCDB/TPC/Calib/Parameters/Run0_999999999_v0_s2.root
diff --git a/TPC/Calib/Pedestals/Run0_999999999_v0_s1.root b/OCDB/TPC/Calib/Pedestals/Run0_999999999_v0_s1.root
similarity index 100%
rename from TPC/Calib/Pedestals/Run0_999999999_v0_s1.root
rename to OCDB/TPC/Calib/Pedestals/Run0_999999999_v0_s1.root
diff --git a/TPC/Calib/RecoParam/Run0_999999999_v0_s0.root b/OCDB/TPC/Calib/RecoParam/Run0_999999999_v0_s0.root
similarity index 100%
rename from TPC/Calib/RecoParam/Run0_999999999_v0_s0.root
rename to OCDB/TPC/Calib/RecoParam/Run0_999999999_v0_s0.root
diff --git a/TPC/Calib/Temperature/Run0_999999999_v0_s0.root b/OCDB/TPC/Calib/Temperature/Run0_999999999_v0_s0.root
similarity index 100%
rename from TPC/Calib/Temperature/Run0_999999999_v0_s0.root
rename to OCDB/TPC/Calib/Temperature/Run0_999999999_v0_s0.root
diff --git a/TPC/Calib/tpcMapping.root b/OCDB/TPC/Calib/tpcMapping.root
similarity index 100%
rename from TPC/Calib/tpcMapping.root
rename to OCDB/TPC/Calib/tpcMapping.root
diff --git a/TPC/Config/Goofie/Run0_999999999_v0_s0.root b/OCDB/TPC/Config/Goofie/Run0_999999999_v0_s0.root
similarity index 100%
rename from TPC/Config/Goofie/Run0_999999999_v0_s0.root
rename to OCDB/TPC/Config/Goofie/Run0_999999999_v0_s0.root
diff --git a/TPC/Config/HLTTemperature/Run0_999999999_v0_s0.root b/OCDB/TPC/Config/HLTTemperature/Run0_999999999_v0_s0.root
similarity index 100%
rename from TPC/Config/HLTTemperature/Run0_999999999_v0_s0.root
rename to OCDB/TPC/Config/HLTTemperature/Run0_999999999_v0_s0.root
diff --git a/TPC/Config/HighVoltage/Run0_999999999_v0_s1.root b/OCDB/TPC/Config/HighVoltage/Run0_999999999_v0_s1.root
similarity index 100%
rename from TPC/Config/HighVoltage/Run0_999999999_v0_s1.root
rename to OCDB/TPC/Config/HighVoltage/Run0_999999999_v0_s1.root
diff --git a/TPC/Config/HighVoltage/Run0_999999999_v0_s2.root b/OCDB/TPC/Config/HighVoltage/Run0_999999999_v0_s2.root
similarity index 100%
rename from TPC/Config/HighVoltage/Run0_999999999_v0_s2.root
rename to OCDB/TPC/Config/HighVoltage/Run0_999999999_v0_s2.root
diff --git a/TPC/Config/HighVoltage/Run0_9999999_v0_s0.root b/OCDB/TPC/Config/HighVoltage/Run0_9999999_v0_s0.root
similarity index 100%
rename from TPC/Config/HighVoltage/Run0_9999999_v0_s0.root
rename to OCDB/TPC/Config/HighVoltage/Run0_9999999_v0_s0.root
diff --git a/TPC/Config/HighVoltageStat/Run0_999999999_v0_s0.root b/OCDB/TPC/Config/HighVoltageStat/Run0_999999999_v0_s0.root
similarity index 100%
rename from TPC/Config/HighVoltageStat/Run0_999999999_v0_s0.root
rename to OCDB/TPC/Config/HighVoltageStat/Run0_999999999_v0_s0.root
diff --git a/TPC/Config/Preprocessor/Run0_999999999_v0_s0.root b/OCDB/TPC/Config/Preprocessor/Run0_999999999_v0_s0.root
similarity index 100%
rename from TPC/Config/Preprocessor/Run0_999999999_v0_s0.root
rename to OCDB/TPC/Config/Preprocessor/Run0_999999999_v0_s0.root
diff --git a/TPC/Config/Preprocessor/Run0_999999999_v0_s1.root b/OCDB/TPC/Config/Preprocessor/Run0_999999999_v0_s1.root
similarity index 100%
rename from TPC/Config/Preprocessor/Run0_999999999_v0_s1.root
rename to OCDB/TPC/Config/Preprocessor/Run0_999999999_v0_s1.root
diff --git a/TPC/Config/Pressure/Run0_9999999_v0_s0.root b/OCDB/TPC/Config/Pressure/Run0_9999999_v0_s0.root
similarity index 100%
rename from TPC/Config/Pressure/Run0_9999999_v0_s0.root
rename to OCDB/TPC/Config/Pressure/Run0_9999999_v0_s0.root
diff --git a/TPC/Config/Temperature/Run0_999999999_v0_s1.root b/OCDB/TPC/Config/Temperature/Run0_999999999_v0_s1.root
similarity index 100%
rename from TPC/Config/Temperature/Run0_999999999_v0_s1.root
rename to OCDB/TPC/Config/Temperature/Run0_999999999_v0_s1.root
diff --git a/TPC/Config/Temperature/Run0_999999999_v0_s2.root b/OCDB/TPC/Config/Temperature/Run0_999999999_v0_s2.root
similarity index 100%
rename from TPC/Config/Temperature/Run0_999999999_v0_s2.root
rename to OCDB/TPC/Config/Temperature/Run0_999999999_v0_s2.root
diff --git a/TPC/Config/Temperature/Run0_9999999_v0_s0.root b/OCDB/TPC/Config/Temperature/Run0_9999999_v0_s0.root
similarity index 100%
rename from TPC/Config/Temperature/Run0_9999999_v0_s0.root
rename to OCDB/TPC/Config/Temperature/Run0_9999999_v0_s0.root
diff --git a/TRD/Align/Data/Run0_999999999_v0_s0.root b/OCDB/TRD/Align/Data/Run0_999999999_v0_s0.root
similarity index 100%
rename from TRD/Align/Data/Run0_999999999_v0_s0.root
rename to OCDB/TRD/Align/Data/Run0_999999999_v0_s0.root
diff --git a/TRD/Calib/ChamberGainFactor/Run0_999999999_v0_s0.root b/OCDB/TRD/Calib/ChamberGainFactor/Run0_999999999_v0_s0.root
similarity index 100%
rename from TRD/Calib/ChamberGainFactor/Run0_999999999_v0_s0.root
rename to OCDB/TRD/Calib/ChamberGainFactor/Run0_999999999_v0_s0.root
diff --git a/TRD/Calib/ChamberStatus/Run0_999999999_v0_s0.root b/OCDB/TRD/Calib/ChamberStatus/Run0_999999999_v0_s0.root
similarity index 100%
rename from TRD/Calib/ChamberStatus/Run0_999999999_v0_s0.root
rename to OCDB/TRD/Calib/ChamberStatus/Run0_999999999_v0_s0.root
diff --git a/TRD/Calib/ChamberT0/Run0_999999999_v0_s0.root b/OCDB/TRD/Calib/ChamberT0/Run0_999999999_v0_s0.root
similarity index 100%
rename from TRD/Calib/ChamberT0/Run0_999999999_v0_s0.root
rename to OCDB/TRD/Calib/ChamberT0/Run0_999999999_v0_s0.root
diff --git a/TRD/Calib/ChamberVdrift/Run0_999999999_v0_s0.root b/OCDB/TRD/Calib/ChamberVdrift/Run0_999999999_v0_s0.root
similarity index 100%
rename from TRD/Calib/ChamberVdrift/Run0_999999999_v0_s0.root
rename to OCDB/TRD/Calib/ChamberVdrift/Run0_999999999_v0_s0.root
diff --git a/TRD/Calib/DCS/Run0_999999999_v0_s0.root b/OCDB/TRD/Calib/DCS/Run0_999999999_v0_s0.root
similarity index 100%
rename from TRD/Calib/DCS/Run0_999999999_v0_s0.root
rename to OCDB/TRD/Calib/DCS/Run0_999999999_v0_s0.root
diff --git a/TRD/Calib/DetNoise/Run0_999999999_v0_s0.root b/OCDB/TRD/Calib/DetNoise/Run0_999999999_v0_s0.root
similarity index 100%
rename from TRD/Calib/DetNoise/Run0_999999999_v0_s0.root
rename to OCDB/TRD/Calib/DetNoise/Run0_999999999_v0_s0.root
diff --git a/TRD/Calib/FEE/Run0_999999999_v0_s0.root b/OCDB/TRD/Calib/FEE/Run0_999999999_v0_s0.root
similarity index 100%
rename from TRD/Calib/FEE/Run0_999999999_v0_s0.root
rename to OCDB/TRD/Calib/FEE/Run0_999999999_v0_s0.root
diff --git a/TRD/Calib/LocalGainFactor/Run0_999999999_v0_s0.root b/OCDB/TRD/Calib/LocalGainFactor/Run0_999999999_v0_s0.root
similarity index 100%
rename from TRD/Calib/LocalGainFactor/Run0_999999999_v0_s0.root
rename to OCDB/TRD/Calib/LocalGainFactor/Run0_999999999_v0_s0.root
diff --git a/TRD/Calib/LocalT0/Run0_999999999_v0_s0.root b/OCDB/TRD/Calib/LocalT0/Run0_999999999_v0_s0.root
similarity index 100%
rename from TRD/Calib/LocalT0/Run0_999999999_v0_s0.root
rename to OCDB/TRD/Calib/LocalT0/Run0_999999999_v0_s0.root
diff --git a/TRD/Calib/LocalVdrift/Run0_999999999_v0_s0.root b/OCDB/TRD/Calib/LocalVdrift/Run0_999999999_v0_s0.root
similarity index 100%
rename from TRD/Calib/LocalVdrift/Run0_999999999_v0_s0.root
rename to OCDB/TRD/Calib/LocalVdrift/Run0_999999999_v0_s0.root
diff --git a/TRD/Calib/MonitoringData/Run0_999999999_v0_s0.root b/OCDB/TRD/Calib/MonitoringData/Run0_999999999_v0_s0.root
similarity index 100%
rename from TRD/Calib/MonitoringData/Run0_999999999_v0_s0.root
rename to OCDB/TRD/Calib/MonitoringData/Run0_999999999_v0_s0.root
diff --git a/TRD/Calib/PIDLQ/Run0_999999999_v0_s0.root b/OCDB/TRD/Calib/PIDLQ/Run0_999999999_v0_s0.root
similarity index 100%
rename from TRD/Calib/PIDLQ/Run0_999999999_v0_s0.root
rename to OCDB/TRD/Calib/PIDLQ/Run0_999999999_v0_s0.root
diff --git a/TRD/Calib/PIDNN/Run0_999999999_v0_s0.root b/OCDB/TRD/Calib/PIDNN/Run0_999999999_v0_s0.root
similarity index 100%
rename from TRD/Calib/PIDNN/Run0_999999999_v0_s0.root
rename to OCDB/TRD/Calib/PIDNN/Run0_999999999_v0_s0.root
diff --git a/TRD/Calib/PIDThresholds/Run0_999999999_v0_s0.root b/OCDB/TRD/Calib/PIDThresholds/Run0_999999999_v0_s0.root
similarity index 100%
rename from TRD/Calib/PIDThresholds/Run0_999999999_v0_s0.root
rename to OCDB/TRD/Calib/PIDThresholds/Run0_999999999_v0_s0.root
diff --git a/TRD/Calib/PRFWidth/Run0_999999999_v0_s0.root b/OCDB/TRD/Calib/PRFWidth/Run0_999999999_v0_s0.root
similarity index 100%
rename from TRD/Calib/PRFWidth/Run0_999999999_v0_s0.root
rename to OCDB/TRD/Calib/PRFWidth/Run0_999999999_v0_s0.root
diff --git a/TRD/Calib/PadNoise/Run0_999999999_v0_s0.root b/OCDB/TRD/Calib/PadNoise/Run0_999999999_v0_s0.root
similarity index 100%
rename from TRD/Calib/PadNoise/Run0_999999999_v0_s0.root
rename to OCDB/TRD/Calib/PadNoise/Run0_999999999_v0_s0.root
diff --git a/TRD/Calib/PadStatus/Run0_999999999_v0_s0.root b/OCDB/TRD/Calib/PadStatus/Run0_999999999_v0_s0.root
similarity index 100%
rename from TRD/Calib/PadStatus/Run0_999999999_v0_s0.root
rename to OCDB/TRD/Calib/PadStatus/Run0_999999999_v0_s0.root
diff --git a/TRD/Calib/RecoParam/Run0_999999999_v0_s0.root b/OCDB/TRD/Calib/RecoParam/Run0_999999999_v0_s0.root
similarity index 100%
rename from TRD/Calib/RecoParam/Run0_999999999_v0_s0.root
rename to OCDB/TRD/Calib/RecoParam/Run0_999999999_v0_s0.root
diff --git a/VZERO/Align/Data/Run0_999999999_v0_s0.root b/OCDB/VZERO/Align/Data/Run0_999999999_v0_s0.root
similarity index 100%
rename from VZERO/Align/Data/Run0_999999999_v0_s0.root
rename to OCDB/VZERO/Align/Data/Run0_999999999_v0_s0.root
diff --git a/VZERO/Calib/Data/Run0_9999999_v0_s0.root b/OCDB/VZERO/Calib/Data/Run0_9999999_v0_s0.root
similarity index 100%
rename from VZERO/Calib/Data/Run0_9999999_v0_s0.root
rename to OCDB/VZERO/Calib/Data/Run0_9999999_v0_s0.root
diff --git a/ZDC/Align/Data/Run0_999999999_v0_s0.root b/OCDB/ZDC/Align/Data/Run0_999999999_v0_s0.root
similarity index 100%
rename from ZDC/Align/Data/Run0_999999999_v0_s0.root
rename to OCDB/ZDC/Align/Data/Run0_999999999_v0_s0.root
diff --git a/ZDC/Calib/ChMap/Run0_999999999_v0_s0.root b/OCDB/ZDC/Calib/ChMap/Run0_999999999_v0_s0.root
similarity index 100%
rename from ZDC/Calib/ChMap/Run0_999999999_v0_s0.root
rename to OCDB/ZDC/Calib/ChMap/Run0_999999999_v0_s0.root
diff --git a/ZDC/Calib/EMDCalib/Run0_999999999_v0_s0.root b/OCDB/ZDC/Calib/EMDCalib/Run0_999999999_v0_s0.root
similarity index 100%
rename from ZDC/Calib/EMDCalib/Run0_999999999_v0_s0.root
rename to OCDB/ZDC/Calib/EMDCalib/Run0_999999999_v0_s0.root
diff --git a/ZDC/Calib/LaserCalib/Run0_999999999_v0_s0.root b/OCDB/ZDC/Calib/LaserCalib/Run0_999999999_v0_s0.root
similarity index 100%
rename from ZDC/Calib/LaserCalib/Run0_999999999_v0_s0.root
rename to OCDB/ZDC/Calib/LaserCalib/Run0_999999999_v0_s0.root
diff --git a/ZDC/Calib/Pedestals/Run0_999999999_v0_s0.root b/OCDB/ZDC/Calib/Pedestals/Run0_999999999_v0_s0.root
similarity index 100%
rename from ZDC/Calib/Pedestals/Run0_999999999_v0_s0.root
rename to OCDB/ZDC/Calib/Pedestals/Run0_999999999_v0_s0.root
diff --git a/ZDC/Calib/RecoParam/Run0_999999999_v0_s0.root b/OCDB/ZDC/Calib/RecoParam/Run0_999999999_v0_s0.root
similarity index 100%
rename from ZDC/Calib/RecoParam/Run0_999999999_v0_s0.root
rename to OCDB/ZDC/Calib/RecoParam/Run0_999999999_v0_s0.root
diff --git a/PHOS/AliPHOSRecoParam.cxx b/PHOS/AliPHOSRecoParam.cxx
index d12b9d677a5..c1f47db1577 100644
--- a/PHOS/AliPHOSRecoParam.cxx
+++ b/PHOS/AliPHOSRecoParam.cxx
@@ -162,7 +162,7 @@ const TObjArray* AliPHOSRecoParam::GetMappings()
   //If not found, read it from OCDB.
 
   //Quick check as follows:
-  //  root [0] AliCDBManager::Instance()->SetDefaultStorage("local://$ALICE_ROOT");
+  //  root [0] AliCDBManager::Instance()->SetDefaultStorage("local://$ALICE_ROOT/OCDB");
   //  root [1] AliCDBManager::Instance()->SetRun(1);
   //  root [2] TObjArray* maps = AliPHOSRecoParam::GetMappings();
   //  root [3] maps->Print();
diff --git a/PHOS/MakePHOSFullMisAlignment.C b/PHOS/MakePHOSFullMisAlignment.C
index a13185ff6eb..93707539970 100644
--- a/PHOS/MakePHOSFullMisAlignment.C
+++ b/PHOS/MakePHOSFullMisAlignment.C
@@ -4,7 +4,7 @@ void MakePHOSFullMisAlignment()
   // from the survey measurements on P2 in May 2008.
   // To store alignment in OCDB, define the evnironment variables:
   // TOCDB=kTRUE
-  // STORAGE="local://$ALICE_ROOT"
+  // STORAGE="local://$ALICE_ROOT/OCDB"
   // Author: Timur Pocheptsov, 19.06.2008
 
   const char * macroName = "MakePHOS2Alignment";
@@ -24,7 +24,7 @@ void MakePHOSFullMisAlignment()
   /*
   AliCDBManager * cdb = AliCDBManager::Instance();
   if (!cdb->IsDefaultStorageSet())
-    cdb->SetDefaultStorage("local://$ALICE_ROOT");
+    cdb->SetDefaultStorage("local://$ALICE_ROOT/OCDB");
   cdb->SetRun(0);
 
   if (TString(gSystem->Getenv("TOCDB")) == TString("kTRUE")) {
diff --git a/PHOS/macros/AlignmentDB/AliPHOSSetAlignment.C b/PHOS/macros/AlignmentDB/AliPHOSSetAlignment.C
index 3a0bcf8011b..674b40cf446 100644
--- a/PHOS/macros/AlignmentDB/AliPHOSSetAlignment.C
+++ b/PHOS/macros/AlignmentDB/AliPHOSSetAlignment.C
@@ -83,7 +83,7 @@ void IdealAlignment()
   // Make CDB storage and put TClonesArray in
   // 
   AliCDBManager *CDB = AliCDBManager::Instance();
-  CDB->SetDefaultStorage("local://$ALICE_ROOT");
+  CDB->SetDefaultStorage("local://$ALICE_ROOT/OCDB");
   
   AliCDBMetaData *md= new AliCDBMetaData();
   md->SetResponsible("Yuri Kharlov");
@@ -145,7 +145,7 @@ void ResidualAlignment()
   // Make CDB storage and put TClonesArray in
   // 
   AliCDBManager *CDB = AliCDBManager::Instance();
-  CDB->SetDefaultStorage("local://$ALICE_ROOT");
+  CDB->SetDefaultStorage("local://$ALICE_ROOT/OCDB");
   
   AliCDBMetaData *md= new AliCDBMetaData();
   md->SetResponsible("Yuri Kharlov");
@@ -206,7 +206,7 @@ void FullMisalignment()
   // Make CDB storage and put TClonesArray in
   // 
   AliCDBManager *CDB = AliCDBManager::Instance();
-  CDB->SetDefaultStorage("local://$ALICE_ROOT");
+  CDB->SetDefaultStorage("local://$ALICE_ROOT/OCDB");
   
   AliCDBMetaData *md= new AliCDBMetaData();
   md->SetResponsible("Yuri Kharlov");
diff --git a/PHOS/macros/AlignmentDB/MakePHOSAlignmentModule2.C b/PHOS/macros/AlignmentDB/MakePHOSAlignmentModule2.C
index 3fb33a10125..1436e93cf58 100644
--- a/PHOS/macros/AlignmentDB/MakePHOSAlignmentModule2.C
+++ b/PHOS/macros/AlignmentDB/MakePHOSAlignmentModule2.C
@@ -4,7 +4,7 @@ void MakePHOSAlignmentModule2()
   // from the survey measurements on P2 in May 2008.
   // To store alignment in OCDB, define the evnironment variables:
   // TOCDB=kTRUE
-  // STORAGE="local://$ALICE_ROOT"
+  // STORAGE="local://$ALICE_ROOT/OCDB"
   // Author: Timur Pocheptsov, 19.06.2008
 
   const char * macroName = "MakePHOS2Alignment";
@@ -21,7 +21,7 @@ void MakePHOSAlignmentModule2()
   //[Part of code, taken from ITS version of MakexxxFullMisalignment
   AliCDBManager * cdb = AliCDBManager::Instance();
   if (!cdb->IsDefaultStorageSet())
-    cdb->SetDefaultStorage("local://$ALICE_ROOT");
+    cdb->SetDefaultStorage("local://$ALICE_ROOT/OCDB");
   cdb->SetRun(0);
 
   if (TString(gSystem->Getenv("TOCDB")) == TString("kTRUE")) {
diff --git a/PHOS/macros/BadModules/makeBadModESD.C b/PHOS/macros/BadModules/makeBadModESD.C
index 601f85ba6ee..c464965996e 100644
--- a/PHOS/macros/BadModules/makeBadModESD.C
+++ b/PHOS/macros/BadModules/makeBadModESD.C
@@ -155,7 +155,7 @@ void makeBadModESD(Int_t mod=3){
 
   //put now result to local CDB
   AliCDBManager *CDB = AliCDBManager::Instance();
-  //  CDB->SetDefaultStorage("local://$ALICE_ROOT");
+  //  CDB->SetDefaultStorage("local://$ALICE_ROOT/OCDB");
   CDB->SetDefaultStorage("local://./");
   //  CDB->SetSpecificStorage("local://./","PHOS");
   
diff --git a/PHOS/macros/BadModules/scanESD.C b/PHOS/macros/BadModules/scanESD.C
index a8435b0432c..54016418871 100644
--- a/PHOS/macros/BadModules/scanESD.C
+++ b/PHOS/macros/BadModules/scanESD.C
@@ -18,7 +18,7 @@ void scanESD(Int_t irun=7727)
   //Author: D.Peressounko Dmitri.Peressounko@cern.ch
 
   //Uncomment the following if misalignement should be applied
-  AliCDBManager::Instance()->SetDefaultStorage("local://$ALICE_ROOT");
+  AliCDBManager::Instance()->SetDefaultStorage("local://$ALICE_ROOT/OCDB");
   //   AliCDBManager::Instance()->SetDefaultStorage("local://./");
   //   AliCDBManager::Instance()->SetSpecificStorage("PHOS/*","local:///data/prsnko/");
   AliCDBManager::Instance()->SetRun(irun) ;
diff --git a/PHOS/macros/BeamTest2006/RawReconstruction.C b/PHOS/macros/BeamTest2006/RawReconstruction.C
index 92821a2fed8..1432e697149 100644
--- a/PHOS/macros/BeamTest2006/RawReconstruction.C
+++ b/PHOS/macros/BeamTest2006/RawReconstruction.C
@@ -3,7 +3,7 @@ void Rec(TString file="raw.root")
   // Reconstruction of RAW data from the input file raw.root
   // Boris Polichtchouk, 13 Mar 2008
 
-  //AliCDBManager::Instance()->SetDefaultStorage("local://$ALICE_ROOT");
+  //AliCDBManager::Instance()->SetDefaultStorage("local://$ALICE_ROOT/OCDB");
   //AliCDBManager::Instance()->SetSpecificStorage("PHOS/*","local://BadMap");
 
   AliReconstruction rec ;
diff --git a/PHOS/macros/CalibrationDB/AliPHOSDecalibrate.C b/PHOS/macros/CalibrationDB/AliPHOSDecalibrate.C
index 94e8e0528a9..3f9b2ba81f0 100644
--- a/PHOS/macros/CalibrationDB/AliPHOSDecalibrate.C
+++ b/PHOS/macros/CalibrationDB/AliPHOSDecalibrate.C
@@ -9,7 +9,7 @@ void AliPHOSDecalibrate(Int_t nevents=1)
 
   //Use "decalibration" database to simulate decalibrated PHOS.
 
-  AliCDBManager::Instance()->SetDefaultStorage("local://$ALICE_ROOT");
+  AliCDBManager::Instance()->SetDefaultStorage("local://$ALICE_ROOT/OCDB");
   AliCDBManager::Instance()->SetSpecificStorage("PHOS","local://DeCalibDB");
 
   // Make digitization, calibration parameters will be taken from CDB
diff --git a/PHOS/macros/CalibrationDB/AliPHOSLocalReconstruction.C b/PHOS/macros/CalibrationDB/AliPHOSLocalReconstruction.C
index 530d2cd79af..ab0997ed010 100644
--- a/PHOS/macros/CalibrationDB/AliPHOSLocalReconstruction.C
+++ b/PHOS/macros/CalibrationDB/AliPHOSLocalReconstruction.C
@@ -3,7 +3,7 @@ AliPHOSLocalReconstruction()
   //Run PHOS clusterization using information from calibration database.
   // Author: Boris Polishchuk (Boris.Polichtchouk at cern.ch)
 
-  AliCDBManager::Instance()->SetDefaultStorage("local://$ALICE_ROOT");
+  AliCDBManager::Instance()->SetDefaultStorage("local://$ALICE_ROOT/OCDB");
   AliCDBManager::Instance()->SetSpecificStorage("PHOS","local://CalibDB");
  
   // Make clusterization, calibration parameters will be taken from CDB
diff --git a/PHOS/macros/CalibrationDB/AliPHOSSetCDB.C b/PHOS/macros/CalibrationDB/AliPHOSSetCDB.C
index c74447c00b8..99506efabda 100644
--- a/PHOS/macros/CalibrationDB/AliPHOSSetCDB.C
+++ b/PHOS/macros/CalibrationDB/AliPHOSSetCDB.C
@@ -116,7 +116,7 @@ void SetCC(Int_t flag=0)
   md.SetBeamPeriod(beamPeriod);
   md.SetResponsible("Boris Polichtchouk");
   
-  AliCDBManager::Instance()->SetDefaultStorage("local://$ALICE_ROOT");
+  AliCDBManager::Instance()->SetDefaultStorage("local://$ALICE_ROOT/OCDB");
   if(gSystem->Getenv("STORAGE")){
     cout << "Setting specific storage" << endl;
     AliCDBManager::Instance()->SetSpecificStorage("PHOS/*",DBFolder.Data());
@@ -156,7 +156,7 @@ void GetCC(Int_t flag=0)
     runNumber = 0;
   }
 
-  AliCDBManager::Instance()->SetDefaultStorage("local://$ALICE_ROOT");
+  AliCDBManager::Instance()->SetDefaultStorage("local://$ALICE_ROOT/OCDB");
   if(gSystem->Getenv("STORAGE")){
     cout << "Setting specific storage" << endl;
     AliCDBManager::Instance()->SetSpecificStorage("PHOS/*",DBFolder.Data());
diff --git a/PHOS/macros/Embed/RecRaw.C b/PHOS/macros/Embed/RecRaw.C
index a91328452fb..b2a167a1ca9 100644
--- a/PHOS/macros/Embed/RecRaw.C
+++ b/PHOS/macros/Embed/RecRaw.C
@@ -3,7 +3,7 @@ void RecRaw(char * file)
   // Reconstruction of RAW data from the input (raw) root file 
   // D.Peressounko after Boris Polichtchouk, 31 Aug 2007
 
-   AliCDBManager::Instance()->SetDefaultStorage("local://$ALICE_ROOT");
+   AliCDBManager::Instance()->SetDefaultStorage("local://$ALICE_ROOT/OCDB");
   // AliCDBManager::Instance()->SetDefaultStorage("local://./");
   // Provide here address of misalignment parametrs, Calibration or bad modules maps
   // AliCDBManager::Instance()->SetSpecificStorage("PHOS/*","local:///data/prsnko/");
diff --git a/PMD/AliPMDCalibrator.cxx b/PMD/AliPMDCalibrator.cxx
index 0bfb1e3b118..921a284d1c7 100644
--- a/PMD/AliPMDCalibrator.cxx
+++ b/PMD/AliPMDCalibrator.cxx
@@ -390,7 +390,7 @@ void AliPMDCalibrator::CalculateIsoCell()
 Bool_t AliPMDCalibrator::Store()
 {
   AliCDBManager *man = AliCDBManager::Instance();
-  //man->SetDefaultStorage("local://$ALICE_ROOT");
+  //man->SetDefaultStorage("local://$ALICE_ROOT/OCDB");
   if(!man->IsDefaultStorageSet()) return kFALSE;
   AliCDBId id("PMD/Calib/Gain",0,999999999);
   AliCDBMetaData md;
diff --git a/PMD/AliPMDPutCalibration.C b/PMD/AliPMDPutCalibration.C
index c7ad8461a04..da9025282f7 100644
--- a/PMD/AliPMDPutCalibration.C
+++ b/PMD/AliPMDPutCalibration.C
@@ -5,7 +5,7 @@ void AliPMDPutCalibration()
 {
   AliPMDCalibData *calibda=new AliPMDCalibData();
   AliCDBManager *man = AliCDBManager::Instance();
-  man->SetDefaultStorage("local://$ALICE_ROOT");
+  man->SetDefaultStorage("local://$ALICE_ROOT/OCDB");
   AliCDBId id("PMD/Calib/Data",0,0);
   AliCDBMetaData *md=new AliCDBMetaData();
   man->GetDefaultStorage()->Put(calibda,id,md);
diff --git a/PMD/AliPMDRec.C b/PMD/AliPMDRec.C
index a3e3120087b..b177185f442 100644
--- a/PMD/AliPMDRec.C
+++ b/PMD/AliPMDRec.C
@@ -3,7 +3,7 @@ void AliPMDRec()
   // This macro for the full reconstruction chain. Only PMD is ON.
   //
   AliCDBManager * man = AliCDBManager::Instance();
-  man->SetDefaultStorage("local://$ALICE_ROOT");
+  man->SetDefaultStorage("local://$ALICE_ROOT/OCDB");
   man->SetRun(0);
 
 
diff --git a/PMD/MakePMDFullMisAlignment.C b/PMD/MakePMDFullMisAlignment.C
index 50245e5fc94..846f167194a 100644
--- a/PMD/MakePMDFullMisAlignment.C
+++ b/PMD/MakePMDFullMisAlignment.C
@@ -39,7 +39,7 @@ void MakePMDFullMisAlignment(){
 
   // Activate CDB storage and load geometry from CDB
   AliCDBManager* cdb = AliCDBManager::Instance();
-  if(!cdb->IsDefaultStorageSet()) cdb->SetDefaultStorage("local://$ALICE_ROOT");
+  if(!cdb->IsDefaultStorageSet()) cdb->SetDefaultStorage("local://$ALICE_ROOT/OCDB");
   cdb->SetRun(0);
   
   AliCDBStorage* storage;
diff --git a/PMD/MakePMDResMisAlignment.C b/PMD/MakePMDResMisAlignment.C
index 4941e721b47..f83902db11d 100644
--- a/PMD/MakePMDResMisAlignment.C
+++ b/PMD/MakePMDResMisAlignment.C
@@ -38,7 +38,7 @@ void MakePMDResMisAlignment(){
 
   // Activate CDB storage and load geometry from CDB
   AliCDBManager* cdb = AliCDBManager::Instance();
-  if(!cdb->IsDefaultStorageSet()) cdb->SetDefaultStorage("local://$ALICE_ROOT");
+  if(!cdb->IsDefaultStorageSet()) cdb->SetDefaultStorage("local://$ALICE_ROOT/OCDB");
   cdb->SetRun(0);
   
   AliCDBStorage* storage;
diff --git a/PMD/PMDSurveyToAlignment_v1.C b/PMD/PMDSurveyToAlignment_v1.C
index b980d2ad8a9..8d967f2c4fe 100644
--- a/PMD/PMDSurveyToAlignment_v1.C
+++ b/PMD/PMDSurveyToAlignment_v1.C
@@ -535,7 +535,7 @@ void PMDSurveyToAlignment_v1(){
   }else{
     // save in CDB storage
     AliCDBManager* cdb = AliCDBManager::Instance();
-    AliCDBStorage* storage = cdb->GetStorage("local://$ALICE_ROOT");
+    AliCDBStorage* storage = cdb->GetStorage("local://$ALICE_ROOT/OCDB");
     AliCDBMetaData* mda = new AliCDBMetaData();
     mda->SetResponsible("   ");
     mda->SetComment("Alignment objects for PMD survey");
diff --git a/PMD/TestPMDPreprocessor.C b/PMD/TestPMDPreprocessor.C
index 8801456d372..151b6f20e73 100644
--- a/PMD/TestPMDPreprocessor.C
+++ b/PMD/TestPMDPreprocessor.C
@@ -17,7 +17,7 @@ void TestPMDPreprocessor()
   // by default they are set to $ALICE_ROOT/SHUTTLE/TestShuttle/TestCDB and TestReference
 
    AliTestShuttle::SetOCDBStorage("local://TestCDB");
-  // AliTestShuttle::SetReferenceStorage("local://$ALICE_ROOT/SHUTTLE/TestShuttle/TestCDB");
+  // AliTestShuttle::SetReferenceStorage("local://$ALICE_ROOT/OCDB/SHUTTLE/TestShuttle/TestCDB");
 
   printf("Test OCDB storage Uri: %s\n", AliTestShuttle::GetOCDBStorage().Data());
 
diff --git a/PWG3/muondep/MuonTrackingEffAnalysis.C b/PWG3/muondep/MuonTrackingEffAnalysis.C
index fa4636fe98a..548ac9f4719 100644
--- a/PWG3/muondep/MuonTrackingEffAnalysis.C
+++ b/PWG3/muondep/MuonTrackingEffAnalysis.C
@@ -40,7 +40,7 @@ void MuonTrackingEffAnalysis(const Bool_t alien = false, const Int_t run = 100,
     }
     else
     {
-      ocdbPath = "local://$ALICE_ROOT";
+      ocdbPath = "local://$ALICE_ROOT/OCDB";
     }
 
     man->SetDefaultStorage(ocdbPath.Data());
diff --git a/PWG3/muondep/RunRecoCheck.C b/PWG3/muondep/RunRecoCheck.C
index 69bc6c1edf6..ed888b4a0c7 100644
--- a/PWG3/muondep/RunRecoCheck.C
+++ b/PWG3/muondep/RunRecoCheck.C
@@ -38,7 +38,7 @@ void RunRecoCheck(Bool_t local = kFALSE) {
   // set the magnetic field for track extrapolations
   // look in the OCDB for the value of the magnet current
   AliCDBManager* cdb = AliCDBManager::Instance();
-  cdb->SetDefaultStorage("local://$ALICE_ROOT");
+  cdb->SetDefaultStorage("local://$ALICE_ROOT/OCDB");
   //cdb->SetDefaultStorage("alien://Folder=/alice/simulation/2008/v4-10-Release/Ideal/");
   cdb->SetRun(0);
 
diff --git a/SHUTTLE/TestShuttle/TestPreprocessor.C b/SHUTTLE/TestShuttle/TestPreprocessor.C
index 5d6d66b6e88..2025673fb46 100644
--- a/SHUTTLE/TestShuttle/TestPreprocessor.C
+++ b/SHUTTLE/TestShuttle/TestPreprocessor.C
@@ -19,8 +19,8 @@ void TestPreprocessor()
 
   // TODO if needed, change location of OCDB and Reference test folders
   // by default they are set to $ALICE_ROOT/SHUTTLE/TestShuttle/TestCDB and TestReference
-  AliTestShuttle::SetMainCDB("local://$ALICE_ROOT/SHUTTLE/TestShuttle/TestCDB");
-  AliTestShuttle::SetMainRefStorage("local://$ALICE_ROOT/SHUTTLE/TestShuttle/TestReference");
+  AliTestShuttle::SetMainCDB("local://$ALICE_ROOT/OCDB/SHUTTLE/TestShuttle/TestCDB");
+  AliTestShuttle::SetMainRefStorage("local://$ALICE_ROOT/OCDB/SHUTTLE/TestShuttle/TestReference");
 
   printf("Test OCDB storage Uri: %s\n", AliShuttleInterface::GetMainCDB().Data());
   printf("Test Reference storage Uri: %s\n", AliShuttleInterface::GetMainRefStorage().Data());
diff --git a/STEER/AliReconstruction.cxx b/STEER/AliReconstruction.cxx
index 330985aced9..eba15b41554 100644
--- a/STEER/AliReconstruction.cxx
+++ b/STEER/AliReconstruction.cxx
@@ -534,7 +534,7 @@ void AliReconstruction::InitCDB()
     	AliDebug(2, Form("Default CDB storage is set to: %s", fCDBUri.Data()));
     	AliDebug(2, "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!");
     } else {
-    	fCDBUri="local://$ALICE_ROOT";
+    	fCDBUri="local://$ALICE_ROOT/OCDB";
     	AliWarning("!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!");
     	AliWarning("Default CDB storage not yet set !!!!");
     	AliWarning(Form("Setting it now to: %s", fCDBUri.Data()));
diff --git a/STEER/AliSimulation.cxx b/STEER/AliSimulation.cxx
index 18fe93a9720..77ff6f9eff8 100644
--- a/STEER/AliSimulation.cxx
+++ b/STEER/AliSimulation.cxx
@@ -265,7 +265,7 @@ void AliSimulation::InitCDB()
     	AliDebug(2, Form("Default CDB storage is set to: %s", fCDBUri.Data()));
     	AliDebug(2, "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!");
     } else {
-    	fCDBUri="local://$ALICE_ROOT";
+    	fCDBUri="local://$ALICE_ROOT/OCDB";
     	AliWarning("!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!");
     	AliWarning("Default CDB storage not yet set !!!!");
     	AliWarning(Form("Setting it now to: %s", fCDBUri.Data()));
diff --git a/STEER/CDBToGrid.C b/STEER/CDBToGrid.C
index 1c7e5466c2a..9d76ab298f8 100644
--- a/STEER/CDBToGrid.C
+++ b/STEER/CDBToGrid.C
@@ -12,7 +12,7 @@
 #include 
 #endif
 
-void CDBToGrid(const char *detName="", const char* fromUri="local://$ALICE_ROOT", 
+void CDBToGrid(const char *detName="", const char* fromUri="local://$ALICE_ROOT/OCDB", 
 	const char* toUri="local://newOCDB")
 {
 
diff --git a/STEER/CheckCDBentries.C b/STEER/CheckCDBentries.C
index 69a7a3e80fc..2841194126b 100644
--- a/STEER/CheckCDBentries.C
+++ b/STEER/CheckCDBentries.C
@@ -10,7 +10,7 @@
 void CheckCDBentries(const char* dest)
 {
 	AliCDBManager* cdb = AliCDBManager::Instance();
-	const char* ref="local://$ALICE_ROOT";
+	const char* ref="local://$ALICE_ROOT/OCDB";
 	cdb->SetDefaultStorage(ref);
 	cdb->SetRun(0);
 	AliCDBStorage* newstor = cdb->GetStorage(dest);
diff --git a/STEER/CreateMeanVertex.C b/STEER/CreateMeanVertex.C
index 647ffee5ce8..5de56c4077c 100644
--- a/STEER/CreateMeanVertex.C
+++ b/STEER/CreateMeanVertex.C
@@ -12,7 +12,7 @@ void CreateMeanVertex(Double_t xmed=0., Double_t ymed=0., Double_t sigx=0.005,Do
   vave->PrintStatus();
 
   AliCDBManager* man = AliCDBManager::Instance();
-  man->SetDefaultStorage("local://$ALICE_ROOT");
+  man->SetDefaultStorage("local://$ALICE_ROOT/OCDB");
   
   AliCDBId id("GRP/Calib/MeanVertex", 0, AliCDBRunRange::Infinity());
   AliCDBMetaData md;
diff --git a/STEER/MergeSetsOfAlignObjs.C b/STEER/MergeSetsOfAlignObjs.C
index efea01b7ae1..e3bb73749db 100644
--- a/STEER/MergeSetsOfAlignObjs.C
+++ b/STEER/MergeSetsOfAlignObjs.C
@@ -41,7 +41,7 @@ void MergeSetsOfAlignObjs(const char* filename1, const char* filename2, const ch
 
   
   AliCDBManager* cdb = AliCDBManager::Instance();
-  cdb->SetDefaultStorage("local://$ALICE_ROOT");
+  cdb->SetDefaultStorage("local://$ALICE_ROOT/OCDB");
   cdb->SetRun(0);
   
   if(fromOcdb1){
diff --git a/T0/AliT0Align.cxx b/T0/AliT0Align.cxx
index f80f6bf2667..7cec0676d76 100644
--- a/T0/AliT0Align.cxx
+++ b/T0/AliT0Align.cxx
@@ -271,7 +271,7 @@ void AliT0Align::StoreAlignObj()
  // Storing T0 alignment objects 
  //
  AliCDBManager* cdb = AliCDBManager::Instance();
- if(!cdb->IsDefaultStorageSet()) cdb->SetDefaultStorage("local://$ALICE_ROOT");
+ if(!cdb->IsDefaultStorageSet()) cdb->SetDefaultStorage("local://$ALICE_ROOT/OCDB");
  //
  TClonesArray *array = new TClonesArray("AliAlignObjParams",2);
 //
diff --git a/T0/AliT0CalibLaserData.cxx b/T0/AliT0CalibLaserData.cxx
index 2e8c6b73398..f5cb4930ee6 100644
--- a/T0/AliT0CalibLaserData.cxx
+++ b/T0/AliT0CalibLaserData.cxx
@@ -236,7 +236,7 @@ void AliT0CalibLaserData::ReadData()
   TString names[106], type;
   AliT0LookUpKey* lookkey= new AliT0LookUpKey();
   AliT0LookUpValue*  lookvalue= new AliT0LookUpValue();
-  AliCDBManager::Instance()->SetDefaultStorage("local://$ALICE_ROOT");
+  AliCDBManager::Instance()->SetDefaultStorage("local://$ALICE_ROOT/OCDB");
   AliCDBManager::Instance()->SetRun(0);
   AliT0Parameters *fParam = AliT0Parameters::Instance();
   fParam->Init();
diff --git a/T0/AliT0SetCDB.C b/T0/AliT0SetCDB.C
index b062d17686f..325d53eec52 100644
--- a/T0/AliT0SetCDB.C
+++ b/T0/AliT0SetCDB.C
@@ -74,7 +74,7 @@ void SetAC()
   alignda->Print();
   
   //Store calibration data into database
-  AliCDBManager::Instance()->SetDefaultStorage("local://$ALICE_ROOT");
+  AliCDBManager::Instance()->SetDefaultStorage("local://$ALICE_ROOT/OCDB");
    AliCDBManager::Instance()->SetSpecificStorage("T0",DBFolder.Data());
   
   AliCDBMetaData md;
@@ -120,7 +120,7 @@ void SetTimeDelay()
  
   calibda->Print();
   //Store calibration data into database
-  AliCDBManager::Instance()->SetDefaultStorage("local://$ALICE_ROOT");
+  AliCDBManager::Instance()->SetDefaultStorage("local://$ALICE_ROOT/OCDB");
 
   //  AliCDBManager::Instance()->SetSpecificStorage("T0",DBFolder.Data());
   
@@ -166,7 +166,7 @@ void SetWalk()
     calibda->SetAmpLEDRec(ipmt);
   }
   //Store calibration data into database
-  AliCDBManager::Instance()->SetDefaultStorage("local://$ALICE_ROOT");
+  AliCDBManager::Instance()->SetDefaultStorage("local://$ALICE_ROOT/OCDB");
 
   //  AliCDBManager::Instance()->SetSpecificStorage("T0",DBFolder.Data());
   
@@ -196,7 +196,7 @@ void GetTimeDelay()
   DBFolder  ="local://Calib";
   Int_t nRun=gAlice->GetRunNumber();
   
-  AliCDBStorage *stor =AliCDBManager::Instance()->GetStorage("local://$ALICE_ROOT");
+  AliCDBStorage *stor =AliCDBManager::Instance()->GetStorage("local://$ALICE_ROOT/OCDB");
   AliCDBEntry* entry = stor->Get("T0/Calib/TimeDelay",0);
   
   AliT0CalibTimeEq *clb = (AliT0CalibTimeEq*)entry->GetObject();
@@ -219,7 +219,7 @@ void GetWalk()
   DBFolder  ="local://Calib";
   Int_t nRun=gAlice->GetRunNumber();
   
-   AliCDBStorage *stor =AliCDBManager::Instance()->GetStorage("local://$ALICE_ROOT");
+   AliCDBStorage *stor =AliCDBManager::Instance()->GetStorage("local://$ALICE_ROOT/OCDB");
    AliCDBEntry* entry = stor->Get("T0/Calib/Slewing_Walk",0);
    
    AliT0CalibWalk *clb = (AliT0CalibWalk*)entry->GetObject();
@@ -270,7 +270,7 @@ void SetLookUp()
   calibda->ReadAsciiLookup("lookUpTable_tanay.txt");
 
   //Store calibration data into database
-  AliCDBManager::Instance()->SetDefaultStorage("local://$ALICE_ROOT");
+  AliCDBManager::Instance()->SetDefaultStorage("local://$ALICE_ROOT/OCDB");
 
   //  AliCDBManager::Instance()->SetSpecificStorage("T0",DBFolder.Data());
 
@@ -299,7 +299,7 @@ void GetLookUp()
   //  DBFolder  ="local://Calib";
   //   Int_t nRun=gAlice->GetRunNumber();
   AliCDBManager* cdb      = AliCDBManager::Instance();
-  AliCDBStorage *stor = cdb->GetStorage("local://$ALICE_ROOT");
+  AliCDBStorage *stor = cdb->GetStorage("local://$ALICE_ROOT/OCDB");
   // cout<<" GetLookUp :: "<Get("T0/Calib/LookUp_Table",2,0,0);
diff --git a/T0/AliT0SetCDBcosmic.C b/T0/AliT0SetCDBcosmic.C
index 9920cbfca3b..b6286ce78e8 100644
--- a/T0/AliT0SetCDBcosmic.C
+++ b/T0/AliT0SetCDBcosmic.C
@@ -73,7 +73,7 @@ void SetTimeDelay()
   */
   calibda->Print();
   //Store calibration data into database
-  AliCDBManager::Instance()->SetDefaultStorage("local://$ALICE_ROOT");
+  AliCDBManager::Instance()->SetDefaultStorage("local://$ALICE_ROOT/OCDB");
   //AliCDBManager::Instance()->SetDefaultStorage("local:///home/alla/alice/testFeb08/OCDB/");
 
   //  AliCDBManager::Instance()->SetSpecificStorage("T0",DBFolder.Data());
@@ -129,7 +129,7 @@ void SetWalk()
 
 
   //Store calibration data into database
- AliCDBManager::Instance()->SetDefaultStorage("local://$ALICE_ROOT");
+ AliCDBManager::Instance()->SetDefaultStorage("local://$ALICE_ROOT/OCDB");
  //AliCDBManager::Instance()->SetDefaultStorage("local:///home/alla/alice/testFeb08/OCDB/");
 
   //  AliCDBManager::Instance()->SetSpecificStorage("T0",DBFolder.Data());
@@ -160,7 +160,7 @@ void GetTimeDelay()
   DBFolder  ="local://Calib";
   Int_t nRun=gAlice->GetRunNumber();
   
-  AliCDBStorage *stor =AliCDBManager::Instance()->GetStorage("local://$ALICE_ROOT");
+  AliCDBStorage *stor =AliCDBManager::Instance()->GetStorage("local://$ALICE_ROOT/OCDB");
        // AliCDBStorage *stor =AliCDBManager::Instance()->GetStorage("local:///home/alla/alice/testFeb08/OCDB/");
   AliCDBEntry* entry = stor->Get("T0/Calib/TimeDelay",25068);
   
@@ -185,7 +185,7 @@ void GetWalk()
   Int_t nRun=gAlice->GetRunNumber();
   //  AliCDBStorage *stor =AliCDBManager::Instance()->GetStorage("local:///home/alla/alice/testFeb08/OCDB/");
  
-       AliCDBStorage *stor =AliCDBManager::Instance()->GetStorage("local://$ALICE_ROOT");
+       AliCDBStorage *stor =AliCDBManager::Instance()->GetStorage("local://$ALICE_ROOT/OCDB");
       AliCDBEntry* entry = stor->Get("T0/Calib/Slewing_Walk",25081);
 
       //  AliT0Parameters* param = AliT0Parameters::Instance();
@@ -248,7 +248,7 @@ void SetLookUp()
   calibda->ReadAsciiLookup("lookUpTable_tanay.txt");
 
   //Store calibration data into database
-  AliCDBManager::Instance()->SetDefaultStorage("local://$ALICE_ROOT");
+  AliCDBManager::Instance()->SetDefaultStorage("local://$ALICE_ROOT/OCDB");
 
   //  AliCDBManager::Instance()->SetSpecificStorage("T0",DBFolder.Data());
 
@@ -277,7 +277,7 @@ void GetLookUp()
   //  DBFolder  ="local://Calib";
   //   Int_t nRun=gAlice->GetRunNumber();
   AliCDBManager* cdb      = AliCDBManager::Instance();
-  AliCDBStorage *stor = cdb->GetStorage("local://$ALICE_ROOT");
+  AliCDBStorage *stor = cdb->GetStorage("local://$ALICE_ROOT/OCDB");
   // cout<<" GetLookUp :: "<Get("T0/Calib/LookUp_Table",2,0,0);
diff --git a/T0/readLaserData.C b/T0/readLaserData.C
index 55b15d71a10..4b3f7740ece 100644
--- a/T0/readLaserData.C
+++ b/T0/readLaserData.C
@@ -30,7 +30,7 @@ void readLaserData(Int_t runNumber=905)
   TString names[106], type;
   AliT0LookUpKey* lookkey= new AliT0LookUpKey();
   AliT0LookUpValue*  lookvalue= new AliT0LookUpValue();
-  AliCDBManager::Instance()->SetDefaultStorage("local://$ALICE_ROOT");
+  AliCDBManager::Instance()->SetDefaultStorage("local://$ALICE_ROOT/OCDB");
   AliCDBManager::Instance()->SetRun(0);
   AliT0Parameters *fParam = AliT0Parameters::Instance();
   fParam->Init();
diff --git a/T0/readRawDDLT0.C b/T0/readRawDDLT0.C
index dab2d6e1a29..000f3a4e7ca 100644
--- a/T0/readRawDDLT0.C
+++ b/T0/readRawDDLT0.C
@@ -40,7 +40,7 @@ void readRawDDLT0()
   TH2F*hLEDCFD= new TH2F("hLEDCFD","LEd vs CFD",500,-0.5,10000.5,500,-0.5,10000.5);
 
   AliCDBManager* cdb      = AliCDBManager::Instance();
-  AliCDBStorage *stor = cdb->GetStorage("local://$ALICE_ROOT");
+  AliCDBStorage *stor = cdb->GetStorage("local://$ALICE_ROOT/OCDB");
 
   // AliRawReader *reader = new AliRawReaderDate("raw0/T0_3328.ddl");
    AliRawReader *reader = new AliRawReaderFile();
diff --git a/TFluka/macro/FlukaConfig.C b/TFluka/macro/FlukaConfig.C
index 40878f85ff6..ed73a617cd6 100644
--- a/TFluka/macro/FlukaConfig.C
+++ b/TFluka/macro/FlukaConfig.C
@@ -53,7 +53,7 @@ void Config()
   }
   
   if(!AliCDBManager::Instance()->IsDefaultStorageSet()){
-      AliCDBManager::Instance()->SetDefaultStorage("local://$ALICE_ROOT");
+      AliCDBManager::Instance()->SetDefaultStorage("local://$ALICE_ROOT/OCDB");
       AliCDBManager::Instance()->SetRun(0);
   }
 
diff --git a/TOF/AliTOFcalib.cxx b/TOF/AliTOFcalib.cxx
index e1b1128744c..c5df0ea493b 100644
--- a/TOF/AliTOFcalib.cxx
+++ b/TOF/AliTOFcalib.cxx
@@ -893,7 +893,7 @@ void AliTOFcalib::CreateTreeFromCDB(Int_t minrun, Int_t maxrun){
   fTree->Branch("nentries",&nentries,"nentries/I");
   fTree->Branch("TOFentries",p,"TOFentries[nentries]/F");
   AliCDBManager *man = AliCDBManager::Instance();
-  AliCDBStorage *aStorage = man->GetStorage("local://$ALICE_ROOT");
+  AliCDBStorage *aStorage = man->GetStorage("local://$ALICE_ROOT/OCDB");
   for (Int_t irun = minrun;irun<=maxrun;irun++){
     AliCDBEntry *entry = aStorage->Get("TOF/RefData/TreeForCalib",irun);
     if (!entry){
diff --git a/TOF/CreateCalibPars_Ideal.C b/TOF/CreateCalibPars_Ideal.C
index 8280bbff75a..e4e49013894 100644
--- a/TOF/CreateCalibPars_Ideal.C
+++ b/TOF/CreateCalibPars_Ideal.C
@@ -2,7 +2,7 @@ void CreateCalibPars_Ideal(){
   // Create TOF Calibration Object for Ideal calibration and 
   // write it on CDB
   AliCDBManager *man = AliCDBManager::Instance();
-  man->SetDefaultStorage("local://$ALICE_ROOT");
+  man->SetDefaultStorage("local://$ALICE_ROOT/OCDB");
   AliTOFcalib *tofcalib = new AliTOFcalib();
   tofcalib->CreateCalArrays();
   TObjArray *tofCalOffline = (TObjArray*) tofcalib->GetTOFCalArrayOffline(); 
diff --git a/TOF/CreateCalibPars_Miscalibrated.C b/TOF/CreateCalibPars_Miscalibrated.C
index 0d221e019df..6eb44d277f1 100644
--- a/TOF/CreateCalibPars_Miscalibrated.C
+++ b/TOF/CreateCalibPars_Miscalibrated.C
@@ -34,7 +34,7 @@ void CreateCalibPars_Miscalibrated(){
   // Fill the Sim calibration object
 
   AliCDBManager *man = AliCDBManager::Instance();
-  man->SetDefaultStorage("local://$ALICE_ROOT");
+  man->SetDefaultStorage("local://$ALICE_ROOT/OCDB");
   TRandom *rnd   = new TRandom(4357);
   Int_t nChannels = AliTOFGeometry::NSectors()*(2*(AliTOFGeometry::NStripC()+AliTOFGeometry::NStripB())+AliTOFGeometry::NStripA())*AliTOFGeometry::NpadZ()*AliTOFGeometry::NpadX();
   for (Int_t ipad = 0 ; ipadSetDefaultStorage("local://$ALICE_ROOT");
+  man->SetDefaultStorage("local://$ALICE_ROOT/OCDB");
   TRandom *rnd   = new TRandom(4357);
   Int_t nChannels = AliTOFGeometry::NSectors()*(2*(AliTOFGeometry::NStripC()+AliTOFGeometry::NStripB())+AliTOFGeometry::NStripA())*AliTOFGeometry::NpadZ()*AliTOFGeometry::NpadX();
   for (Int_t ipad = 0 ; ipadAdd(new TObjString("IntegralThr"),new TObjString(integralThr));
 	mapTOF->Add(new TObjString("ThrPar"),new TObjString(thrPar));
 	AliCDBManager *man = AliCDBManager::Instance();
-	man->SetDefaultStorage("local://$ALICE_ROOT");
+	man->SetDefaultStorage("local://$ALICE_ROOT/OCDB");
 	tofcalib->WriteConfigMapOnCDB("TOF/Calib");
 }
diff --git a/TOF/CreateIdealOnlineCalibPars.C b/TOF/CreateIdealOnlineCalibPars.C
index afb83ac8cb9..29c66d51fd3 100644
--- a/TOF/CreateIdealOnlineCalibPars.C
+++ b/TOF/CreateIdealOnlineCalibPars.C
@@ -16,7 +16,7 @@ void CreateIdealOnlineCalibPars(){
   // Write the dummy offline calibration object on CDB
 
   AliCDBManager *man = AliCDBManager::Instance();
-  man->SetDefaultStorage("local://$ALICE_ROOT");
+  man->SetDefaultStorage("local://$ALICE_ROOT/OCDB");
   Int_t nChannels = AliTOFGeometry::NSectors()*(2*(AliTOFGeometry::NStripC()+AliTOFGeometry::NStripB())+AliTOFGeometry::NStripA())*AliTOFGeometry::NpadZ()*AliTOFGeometry::NpadX();
   for (Int_t ipad = 0 ; ipadAt(ipad);
diff --git a/TOF/CreateOnlineCalibPars.C b/TOF/CreateOnlineCalibPars.C
index 5ca746fa407..83df62d18a2 100644
--- a/TOF/CreateOnlineCalibPars.C
+++ b/TOF/CreateOnlineCalibPars.C
@@ -17,7 +17,7 @@ void CreateOnlineCalibPars(){
   // Write the online calibration object on CDB
 
   AliCDBManager *man = AliCDBManager::Instance();
-  man->SetDefaultStorage("local://$ALICE_ROOT");
+  man->SetDefaultStorage("local://$ALICE_ROOT/OCDB");
   Int_t nChannels = AliTOFGeometry::NSectors()*(2*(AliTOFGeometry::NStripC()+AliTOFGeometry::NStripB())+AliTOFGeometry::NStripA())*AliTOFGeometry::NpadZ()*AliTOFGeometry::NpadX();
   Float_t delay=0.;
   Float_t meanDelay=0.3;
diff --git a/TOF/CreateRecPars_CDB.C b/TOF/CreateRecPars_CDB.C
index 90230a9429e..07b5863e48c 100755
--- a/TOF/CreateRecPars_CDB.C
+++ b/TOF/CreateRecPars_CDB.C
@@ -2,7 +2,7 @@ void CreateRecPars_CDB(){
   // Create TOF Calibration Object for Ideal calibration and 
   // write it on CDB
   AliCDBManager *man = AliCDBManager::Instance();
-  man->SetDefaultStorage("local://$ALICE_ROOT");
+  man->SetDefaultStorage("local://$ALICE_ROOT/OCDB");
   AliTOFcalib *tofcalib = new AliTOFcalib();
   AliTOFRecoParam *param = new AliTOFRecoParam();
   tofcalib->WriteRecParOnCDB("TOF/Calib",0,999999999,param);
diff --git a/TOF/MakeTOFFullMisAlignment.C b/TOF/MakeTOFFullMisAlignment.C
index 42593506930..3956bf9c558 100644
--- a/TOF/MakeTOFFullMisAlignment.C
+++ b/TOF/MakeTOFFullMisAlignment.C
@@ -7,7 +7,7 @@ void MakeTOFFullMisAlignment(){
   
   // Activate CDB storage and load geometry from CDB
   AliCDBManager* cdb = AliCDBManager::Instance();
-  if(!cdb->IsDefaultStorageSet()) cdb->SetDefaultStorage("local://$ALICE_ROOT");
+  if(!cdb->IsDefaultStorageSet()) cdb->SetDefaultStorage("local://$ALICE_ROOT/OCDB");
   cdb->SetRun(0);
   
   AliCDBStorage* storage;
diff --git a/TOF/MakeTOFRecoParam.C b/TOF/MakeTOFRecoParam.C
index 17b56a8d954..53b6df6335e 100644
--- a/TOF/MakeTOFRecoParam.C
+++ b/TOF/MakeTOFRecoParam.C
@@ -2,7 +2,7 @@ void MakeTOFRecoParam(AliRecoParam::EventSpecie_t default=AliRecoParam::kLowMult
   // Create TOF Calibration Object for Ideal calibration and 
   // write it on CDB
   AliCDBManager *man = AliCDBManager::Instance();
-  man->SetDefaultStorage("local://$ALICE_ROOT");
+  man->SetDefaultStorage("local://$ALICE_ROOT/OCDB");
 
   TObjArray *recoParamArray = new TObjArray();
 
diff --git a/TOF/MakeTOFResMisAlignment.C b/TOF/MakeTOFResMisAlignment.C
index 5c3369d7192..1214182faa9 100644
--- a/TOF/MakeTOFResMisAlignment.C
+++ b/TOF/MakeTOFResMisAlignment.C
@@ -8,7 +8,7 @@ void MakeTOFResMisAlignment(){
 
   // Activate CDB storage and load geometry from CDB
   AliCDBManager* cdb = AliCDBManager::Instance();
-  if(!cdb->IsDefaultStorageSet()) cdb->SetDefaultStorage("local://$ALICE_ROOT");
+  if(!cdb->IsDefaultStorageSet()) cdb->SetDefaultStorage("local://$ALICE_ROOT/OCDB");
   cdb->SetRun(0);
   
   AliCDBStorage* storage;
diff --git a/TOF/MakeTOFZeroMisAlignment.C b/TOF/MakeTOFZeroMisAlignment.C
index 871c54094eb..235a30bc187 100644
--- a/TOF/MakeTOFZeroMisAlignment.C
+++ b/TOF/MakeTOFZeroMisAlignment.C
@@ -7,7 +7,7 @@ void MakeTOFZeroMisAlignment(){
 
   // Activate CDB storage and load geometry from CDB
   AliCDBManager* cdb = AliCDBManager::Instance();
-  if(!cdb->IsDefaultStorageSet()) cdb->SetDefaultStorage("local://$ALICE_ROOT");
+  if(!cdb->IsDefaultStorageSet()) cdb->SetDefaultStorage("local://$ALICE_ROOT/OCDB");
   cdb->SetRun(0);
   
   AliCDBStorage* storage;
diff --git a/TOF/TOFPreprocessor.C b/TOF/TOFPreprocessor.C
index e39c2467d61..ec59993be55 100644
--- a/TOF/TOFPreprocessor.C
+++ b/TOF/TOFPreprocessor.C
@@ -17,8 +17,8 @@ void TOFPreprocessor(Char_t * RunType="PHYSICS")
 
   AliLog::SetClassDebugLevel("AliTOFPreprocessor",2);
   // initialize location of CDB
-  AliTestShuttle::SetMainCDB("local://$ALICE_ROOT/SHUTTLE/TestShuttle/TestCDB");
-  AliTestShuttle::SetMainRefStorage("local://$ALICE_ROOT/SHUTTLE/TestShuttle/TestReference");
+  AliTestShuttle::SetMainCDB("local://$ALICE_ROOT/OCDB/SHUTTLE/TestShuttle/TestCDB");
+  AliTestShuttle::SetMainRefStorage("local://$ALICE_ROOT/OCDB/SHUTTLE/TestShuttle/TestReference");
 
   // create AliTestShuttle instance
   Int_t nrun = 6;
@@ -205,7 +205,7 @@ void WriteDCSAliasMap()
   AliCDBId id("TOF/DCS/Data", 0, 0);
 
   // initialize location of CDB
-  AliCDBManager::Instance()->SetDefaultStorage("local://$ALICE_ROOT/SHUTTLE/TestShuttle/TestCDB");
+  AliCDBManager::Instance()->SetDefaultStorage("local://$ALICE_ROOT/OCDB/SHUTTLE/TestShuttle/TestCDB");
 
   AliCDBManager::Instance()->Put(dcsAliasMap, id, &metaData);
 }
diff --git a/TOF/TOFPreprocessorFDR.C b/TOF/TOFPreprocessorFDR.C
index 6041777a3ff..771250e4c55 100644
--- a/TOF/TOFPreprocessorFDR.C
+++ b/TOF/TOFPreprocessorFDR.C
@@ -17,8 +17,8 @@ void TOFPreprocessorFDR()
 
   AliLog::SetClassDebugLevel("AliTOFPreprocessorFDR",1);
   // initialize location of CDB
-  AliTestShuttle::SetMainCDB("local://$ALICE_ROOT/SHUTTLE/TestShuttle/TestCDB");
-  AliTestShuttle::SetMainRefStorage("local://$ALICE_ROOT/SHUTTLE/TestShuttle/TestReference");
+  AliTestShuttle::SetMainCDB("local://$ALICE_ROOT/OCDB/SHUTTLE/TestShuttle/TestCDB");
+  AliTestShuttle::SetMainRefStorage("local://$ALICE_ROOT/OCDB/SHUTTLE/TestShuttle/TestReference");
 
   // create AliTestShuttle instance
   AliTestShuttle* shuttle = new AliTestShuttle(0, 0, 1000);
@@ -153,7 +153,7 @@ void WriteDCSAliasMap()
   AliCDBId id("TOF/DCS/Data", 0, 0);
 
   // initialize location of CDB
-  AliCDBManager::Instance()->SetDefaultStorage("local://$ALICE_ROOT/SHUTTLE/TestShuttle/TestCDB");
+  AliCDBManager::Instance()->SetDefaultStorage("local://$ALICE_ROOT/OCDB/SHUTTLE/TestShuttle/TestCDB");
 
   AliCDBManager::Instance()->Put(dcsAliasMap, id, &metaData);
 }
diff --git a/TPC/AliTPCAlign.cxx b/TPC/AliTPCAlign.cxx
index 87b30dcab3e..8432c896e97 100644
--- a/TPC/AliTPCAlign.cxx
+++ b/TPC/AliTPCAlign.cxx
@@ -286,7 +286,7 @@ void AliTPCAlign::Run(){
 void AliTPCAlign::StoreAlignObj(){
   //
 AliCDBManager* cdb = AliCDBManager::Instance();
- if(!cdb->IsDefaultStorageSet()) cdb->SetDefaultStorage("local://$ALICE_ROOT");
+ if(!cdb->IsDefaultStorageSet()) cdb->SetDefaultStorage("local://$ALICE_ROOT/OCDB");
  //
 TClonesArray *array = new TClonesArray("AliAlignObjParams",1);
 //
diff --git a/TPC/AliTPCClusterParam.cxx b/TPC/AliTPCClusterParam.cxx
index 9ff841554a4..fad5565fbf1 100644
--- a/TPC/AliTPCClusterParam.cxx
+++ b/TPC/AliTPCClusterParam.cxx
@@ -61,7 +61,7 @@
 //
 //  Example how to retrieve the paramterization:
 /*    
-      AliCDBManager::Instance()->SetDefaultStorage("local://$ALICE_ROOT");
+      AliCDBManager::Instance()->SetDefaultStorage("local://$ALICE_ROOT/OCDB");
       AliCDBManager::Instance()->SetRun(0) 
       AliTPCClusterParam * param = AliTPCcalibDB::Instance()->GetClusterParam();
 
diff --git a/TPC/AliTPCComparison.C b/TPC/AliTPCComparison.C
index 6b99bb520c3..e14f7cadace 100644
--- a/TPC/AliTPCComparison.C
+++ b/TPC/AliTPCComparison.C
@@ -409,7 +409,7 @@ Int_t GoodTracksTPC(const Char_t *dir) {
 
 
    AliCDBManager *man=AliCDBManager::Instance();
-   man->SetDefaultStorage("local://$ALICE_ROOT");
+   man->SetDefaultStorage("local://$ALICE_ROOT/OCDB");
    man->SetRun(0);
    AliTPCParamSR *digp=
    (AliTPCParamSR*)(AliTPCcalibDB::Instance()->GetParameters());
diff --git a/TPC/AliTPCGenDBTemp.cxx b/TPC/AliTPCGenDBTemp.cxx
index 428d63735b2..95392c68e2b 100644
--- a/TPC/AliTPCGenDBTemp.cxx
+++ b/TPC/AliTPCGenDBTemp.cxx
@@ -9,7 +9,7 @@
 //  Data base entry generation:
   
 //  AliTPCGenDBTemp db
-//  db->SetDefaultStorage("local://$ALICE_ROOT");
+//  db->SetDefaultStorage("local://$ALICE_ROOT/OCDB");
 //  db->SetSpecificStorage("local:///afs/cern.ch/alice/tpctest/Calib/");
 //  db->Init(0,"TPC/Config/Temperature","TPC/*/*")
 //  db->MakeConfig("TempSensor.txt",0,999999999,"TPC/Config/Temperature")
diff --git a/TPC/AliTPCcalibTracks.cxx b/TPC/AliTPCcalibTracks.cxx
index b8396289211..14c86d4bba8 100644
--- a/TPC/AliTPCcalibTracks.cxx
+++ b/TPC/AliTPCcalibTracks.cxx
@@ -2547,7 +2547,7 @@ void  AliTPCcalibTracks::MakeQPosNormAll(TTree * chainres, AliTPCClusterParam *
     //1. Load Parameters to be modified:
     //e.g:
     
-    AliCDBManager::Instance()->SetDefaultStorage("local://$ALICE_ROOT");
+    AliCDBManager::Instance()->SetDefaultStorage("local://$ALICE_ROOT/OCDB");
     AliCDBManager::Instance()->SetRun(0) 
     AliTPCClusterParam * param = AliTPCcalibDB::Instance()->GetClusterParam();
 
diff --git a/TPC/AliTPCcalibUnlinearity.cxx b/TPC/AliTPCcalibUnlinearity.cxx
index 369a1c958da..1748e3bcd25 100644
--- a/TPC/AliTPCcalibUnlinearity.cxx
+++ b/TPC/AliTPCcalibUnlinearity.cxx
@@ -665,7 +665,7 @@ void  AliTPCcalibUnlinearity::MakeQPosNormAll(TTree * chainUnlinD, AliTPCCluster
     //1. Load Parameters to be modified:
     //e.g:
     
-    AliCDBManager::Instance()->SetDefaultStorage("local://$ALICE_ROOT");
+    AliCDBManager::Instance()->SetDefaultStorage("local://$ALICE_ROOT/OCDB");
     AliCDBManager::Instance()->SetRun(0) 
     AliTPCClusterParam * param = AliTPCcalibDB::Instance()->GetClusterParam();
     //
diff --git a/TPC/Cal/AliTPCCreateDummyCDB.C b/TPC/Cal/AliTPCCreateDummyCDB.C
index e0bbb112217..615f96efaf9 100644
--- a/TPC/Cal/AliTPCCreateDummyCDB.C
+++ b/TPC/Cal/AliTPCCreateDummyCDB.C
@@ -27,7 +27,7 @@
 //
 // run number for the dummy file
 Int_t gkDummyRun = 0;
-char *gCDBpath   = "local://$ALICE_ROOT";
+char *gCDBpath   = "local://$ALICE_ROOT/OCDB";
 AliCDBStorage* gStorLoc = 0;
 
 //
diff --git a/TPC/CalibMacros/CalibClParam.C b/TPC/CalibMacros/CalibClParam.C
index 57cdfb16b52..3e31232d259 100644
--- a/TPC/CalibMacros/CalibClParam.C
+++ b/TPC/CalibMacros/CalibClParam.C
@@ -17,7 +17,7 @@ void PseudoCode(){
   
   //1. Load Parameters to be modified:
   //e.g:
-  AliCDBManager::Instance()->SetDefaultStorage("local://$ALICE_ROOT");
+  AliCDBManager::Instance()->SetDefaultStorage("local://$ALICE_ROOT/OCDB");
   AliCDBManager::Instance()->SetRun(0) ;
   AliTPCClusterParam * param = AliTPCcalibDB::Instance()->GetClusterParam();  
   //
@@ -93,7 +93,7 @@ void TestChainCosmicDedx(){
   gSystem->Load("libANALYSIS");
   gSystem->Load("libSTAT");
   gSystem->Load("libTPCcalib");
-  AliCDBManager::Instance()->SetDefaultStorage("local://$ALICE_ROOT");
+  AliCDBManager::Instance()->SetDefaultStorage("local://$ALICE_ROOT/OCDB");
   AliCDBManager::Instance()->SetRun(0) ;
   AliTPCClusterParam * param = AliTPCcalibDB::Instance()->GetClusterParam();  
   param->SetInstance(param);
diff --git a/TPC/CalibMacros/CalibClParamNew.C b/TPC/CalibMacros/CalibClParamNew.C
index 276c12a99e4..77a74483acf 100644
--- a/TPC/CalibMacros/CalibClParamNew.C
+++ b/TPC/CalibMacros/CalibClParamNew.C
@@ -38,7 +38,7 @@ metaData->SetBeamPeriod(1);
 metaData->SetAliRootVersion("05-06-00"); //root version
 metaData->SetComment("October runs calibration");
 AliCDBId id1("TPC/Calib/ClusterParam", runNumber, AliCDBRunRange::Infinity());
-gStorage = AliCDBManager::Instance()->GetStorage("local://$ALICE_ROOT");
+gStorage = AliCDBManager::Instance()->GetStorage("local://$ALICE_ROOT/OCDB");
 gStorage->Put(paramCl, id1, metaData);
 
 
diff --git a/TPC/CalibMacros/CalibEnv.C b/TPC/CalibMacros/CalibEnv.C
index fc0c3e6b60c..a42e833fa67 100644
--- a/TPC/CalibMacros/CalibEnv.C
+++ b/TPC/CalibMacros/CalibEnv.C
@@ -47,8 +47,8 @@ void Init(){
   //
   //
   //
-  AliCDBManager::Instance()->SetDefaultStorage("local://$ALICE_ROOT");
-  AliCDBManager::Instance()->SetSpecificStorage("TPC/Calib/Parameters","local://$ALICE_ROOT");
+  AliCDBManager::Instance()->SetDefaultStorage("local://$ALICE_ROOT/OCDB");
+  AliCDBManager::Instance()->SetSpecificStorage("TPC/Calib/Parameters","local://$ALICE_ROOT/OCDB");
   AliCDBManager::Instance()->SetSpecificStorage("GRP/GRP/Data","local:///lustre_alpha/alice/alien/alice/data/2008/LHC08d/OCDB/");
   AliCDBManager::Instance()->SetSpecificStorage("TPC/Calib/Temperature","local:///lustre_alpha/alice/alien/alice/data/2008/LHC08d/OCDB/");
   AliCDBManager::Instance()->SetSpecificStorage("TPC/Calib/HighVoltage","local:///lustre_alpha/alice/alien/alice/data/2008/LHC08d/OCDB/");
@@ -65,8 +65,8 @@ void InitAlien(const char *path="LHC08b"){
   alpath+=path;
   alpath+="/OCDB";
     
-  AliCDBManager::Instance()->SetDefaultStorage("local://$ALICE_ROOT");
-  AliCDBManager::Instance()->SetSpecificStorage("TPC/Calib/Parameters","local://$ALICE_ROOT");
+  AliCDBManager::Instance()->SetDefaultStorage("local://$ALICE_ROOT/OCDB");
+  AliCDBManager::Instance()->SetSpecificStorage("TPC/Calib/Parameters","local://$ALICE_ROOT/OCDB");
   AliCDBManager::Instance()->SetSpecificStorage("GRP/GRP/Data",alpath.Data());
   AliCDBManager::Instance()->SetSpecificStorage("TPC/Calib/Temperature",alpath.Data());
   AliCDBManager::Instance()->SetSpecificStorage("TPC/Calib/Goofie",alpath.Data());
diff --git a/TPC/MakeTPCFullMisAlignment.C b/TPC/MakeTPCFullMisAlignment.C
index 3160ba97d3d..6d01a793353 100644
--- a/TPC/MakeTPCFullMisAlignment.C
+++ b/TPC/MakeTPCFullMisAlignment.C
@@ -4,7 +4,7 @@ void MakeTPCFullMisAlignment(){
   const char* macroname = "MakeTPCFullMisAlignment.C";
   // Activate CDB storage and load geometry from CDB
   AliCDBManager* cdb = AliCDBManager::Instance();
-  if(!cdb->IsDefaultStorageSet()) cdb->SetDefaultStorage("local://$ALICE_ROOT");
+  if(!cdb->IsDefaultStorageSet()) cdb->SetDefaultStorage("local://$ALICE_ROOT/OCDB");
   cdb->SetRun(0);
   
   AliCDBStorage* storage;
diff --git a/TPC/MakeTPCResMisAlignment.C b/TPC/MakeTPCResMisAlignment.C
index 617486c98f5..2462b0d9834 100644
--- a/TPC/MakeTPCResMisAlignment.C
+++ b/TPC/MakeTPCResMisAlignment.C
@@ -5,7 +5,7 @@ void MakeTPCResMisAlignment(){
 
   // Activate CDB storage and load geometry from CDB
   AliCDBManager* cdb = AliCDBManager::Instance();
-  if(!cdb->IsDefaultStorageSet()) cdb->SetDefaultStorage("local://$ALICE_ROOT");
+  if(!cdb->IsDefaultStorageSet()) cdb->SetDefaultStorage("local://$ALICE_ROOT/OCDB");
   cdb->SetRun(0);
   
   AliCDBStorage* storage;
diff --git a/TPC/MakeTPCZeroMisAlignment.C b/TPC/MakeTPCZeroMisAlignment.C
index 2c4d26b712f..9661b4c5aec 100644
--- a/TPC/MakeTPCZeroMisAlignment.C
+++ b/TPC/MakeTPCZeroMisAlignment.C
@@ -8,7 +8,7 @@ void MakeTPCZeroMisAlignment(){
   
   // Activate CDB storage and load geometry from CDB
   AliCDBManager* cdb = AliCDBManager::Instance();
-  if(!cdb->IsDefaultStorageSet()) cdb->SetDefaultStorage("local://$ALICE_ROOT");
+  if(!cdb->IsDefaultStorageSet()) cdb->SetDefaultStorage("local://$ALICE_ROOT/OCDB");
   cdb->SetRun(0);
   
   AliCDBStorage* storage = NULL;
diff --git a/TPC/macros/CalibrateTPC.C b/TPC/macros/CalibrateTPC.C
index 0f294631f8b..4d573fc77d5 100644
--- a/TPC/macros/CalibrateTPC.C
+++ b/TPC/macros/CalibrateTPC.C
@@ -59,7 +59,7 @@ TObject  * SetupCalibTask(char * prefix ="/V12/") {
   //
   //
   AliCDBManager::Instance()->SetRun(1) ;
-  AliCDBManager::Instance()->SetDefaultStorage("local://$ALICE_ROOT");
+  AliCDBManager::Instance()->SetDefaultStorage("local://$ALICE_ROOT/OCDB");
   AliTPCClusterParam * clusterParam = AliTPCcalibDB::Instance()->GetClusterParam();
   AliTPCAnalysisTaskcalib *task1=new AliTPCAnalysisTaskcalib("TPC calibration task");
   
diff --git a/TPC/macros/ConfigOCDB.C b/TPC/macros/ConfigOCDB.C
index c4986983ebe..1a9edd27f9b 100644
--- a/TPC/macros/ConfigOCDB.C
+++ b/TPC/macros/ConfigOCDB.C
@@ -24,10 +24,10 @@ void ConfigOCDB(Float_t bfield){
   //
   //
   //
-  AliCDBManager::Instance()->SetDefaultStorage("local://$ALICE_ROOT");
-  AliCDBManager::Instance()->SetSpecificStorage("TPC/Calib/Parameters","local://$ALICE_ROOT");
-  AliCDBManager::Instance()->SetSpecificStorage("TPC/Calib/ClusterParam","local://$ALICE_ROOT");
-  //  AliCDBManager::Instance()->SetSpecificStorage("TPC/Calib/PadTime0","local://$ALICE_ROOT");
+  AliCDBManager::Instance()->SetDefaultStorage("local://$ALICE_ROOT/OCDB");
+  AliCDBManager::Instance()->SetSpecificStorage("TPC/Calib/Parameters","local://$ALICE_ROOT/OCDB");
+  AliCDBManager::Instance()->SetSpecificStorage("TPC/Calib/ClusterParam","local://$ALICE_ROOT/OCDB");
+  //  AliCDBManager::Instance()->SetSpecificStorage("TPC/Calib/PadTime0","local://$ALICE_ROOT/OCDB");
   AliCDBManager::Instance()->SetSpecificStorage("TPC/Calib/PadTime0","local:///u/miranov/OCDB0");
 
   AliCDBManager::Instance()->SetSpecificStorage("GRP/GRP/Data","local:///lustre_alpha/alice/alien/alice/data/2008/LHC08d/OCDB/");
diff --git a/TPC/macros/MakeClusterParam.C b/TPC/macros/MakeClusterParam.C
index 8ea043863d1..359a8cd53c4 100644
--- a/TPC/macros/MakeClusterParam.C
+++ b/TPC/macros/MakeClusterParam.C
@@ -47,7 +47,7 @@ void StoreObject(AliTPCClusterParam *clParam)
   //
   //
   Int_t gkDummyRun = 0;
-  char *gCDBpath   = "local://$ALICE_ROOT";
+  char *gCDBpath   = "local://$ALICE_ROOT/OCDB";
   AliCDBMetaData *md1= new AliCDBMetaData(); 
   AliCDBId id1("TPC/Calib/ClusterParam", gkDummyRun, gkDummyRun); 
   AliCDBStorage* gStorLoc = 0;
diff --git a/TPC/macros/TestV0.C b/TPC/macros/TestV0.C
index 0da8ae31031..7e58ee18e54 100644
--- a/TPC/macros/TestV0.C
+++ b/TPC/macros/TestV0.C
@@ -61,7 +61,7 @@ AliAnalysisManager * SetupV0Task() {
   //
   //
   AliCDBManager::Instance()->SetRun(1) ;
-  AliCDBManager::Instance()->SetDefaultStorage("local://$ALICE_ROOT");
+  AliCDBManager::Instance()->SetDefaultStorage("local://$ALICE_ROOT/OCDB");
 
   AliTPCAnalysisTaskcalib *task1=new AliTPCAnalysisTaskcalib("TPC calibration task");
   
diff --git a/TPC/macros/gainCalib.C b/TPC/macros/gainCalib.C
index 91042efc45f..23a9f515e37 100644
--- a/TPC/macros/gainCalib.C
+++ b/TPC/macros/gainCalib.C
@@ -21,7 +21,7 @@ TStatToolkit toolkit;
 void Init(){
 
   AliCDBManager::Instance()->SetRun(0);
-  AliCDBManager::Instance()->SetDefaultStorage("local://$ALICE_ROOT");
+  AliCDBManager::Instance()->SetDefaultStorage("local://$ALICE_ROOT/OCDB");
   AliTPCClusterParam *clparam = AliTPCcalibDB::Instance()->GetClusterParam();
   AliTPCClusterParam::SetInstance(clparam);  
   //
diff --git a/TPC/macros/recMag5.C b/TPC/macros/recMag5.C
index 2bec166cd6c..6ed3b8c22be 100644
--- a/TPC/macros/recMag5.C
+++ b/TPC/macros/recMag5.C
@@ -13,16 +13,16 @@ void recMag5(const char *filename="data.root")
   //man->SetDefaultStorage("local:///data/OCDB");
   
   // Files that we can not read from alien...solved
-  //  man->SetSpecificStorage("ITS/Calib/MapsAnodeSDD","local://$ALICE_ROOT");
-  //  man->SetSpecificStorage("ITS/Calib/MapsTimeSDD","local://$ALICE_ROOT");
-  //  man->SetSpecificStorage("TPC/Calib/ExB","local://$ALICE_ROOT");
+  //  man->SetSpecificStorage("ITS/Calib/MapsAnodeSDD","local://$ALICE_ROOT/OCDB");
+  //  man->SetSpecificStorage("ITS/Calib/MapsTimeSDD","local://$ALICE_ROOT/OCDB");
+  //  man->SetSpecificStorage("TPC/Calib/ExB","local://$ALICE_ROOT/OCDB");
 
   // Objects not found if using LHC07w database...solved
   //  man->SetSpecificStorage("ITS/Calib/MapsAnodeSDD","local:///afs/cern.ch/user/c/cheshkov/public/OCDB");
-  // man->SetSpecificStorage("GRP/GRP/Data","local://$ALICE_ROOT");
-  // man->SetSpecificStorage("ITS/Calib/DDLMapSDD","local://$ALICE_ROOT");
-  // man->SetSpecificStorage("MUON/Calib/Mapping","local://$ALICE_ROOT");
-  // man->SetSpecificStorage("MUON/Calib/DDLStore","local://$ALICE_ROOT");
+  // man->SetSpecificStorage("GRP/GRP/Data","local://$ALICE_ROOT/OCDB");
+  // man->SetSpecificStorage("ITS/Calib/DDLMapSDD","local://$ALICE_ROOT/OCDB");
+  // man->SetSpecificStorage("MUON/Calib/Mapping","local://$ALICE_ROOT/OCDB");
+  // man->SetSpecificStorage("MUON/Calib/DDLStore","local://$ALICE_ROOT/OCDB");
   
   AliITSRecoParam * itsRecoParam =  AliITSRecoParam::GetCosmicTestParam();
   itsRecoParam->SetFactorSAWindowSizes(20);
diff --git a/TPC/macros/testTPC/rec.C b/TPC/macros/testTPC/rec.C
index 2a4851a11a1..dae63edc458 100644
--- a/TPC/macros/testTPC/rec.C
+++ b/TPC/macros/testTPC/rec.C
@@ -27,9 +27,9 @@ void rec(const char *filename="data.root")
   man->SetDefaultStorage(ocdbpath);
   //  man->SetSpecificStorage("TPC/Calib/Parameters","local:///data/test2007/");
   // man->SetSpecificStorage("TPC/Calib/PadNoise","local:///data/test2007/");
-  //   man->SetSpecificStorage("ITS/Calib/DDLMapSDD","local://$ALICE_ROOT");
-  //   man->SetSpecificStorage("MUON/Calib/Mapping","local://$ALICE_ROOT");
-  //   man->SetSpecificStorage("MUON/Calib/DDLStore","local://$ALICE_ROOT");
+  //   man->SetSpecificStorage("ITS/Calib/DDLMapSDD","local://$ALICE_ROOT/OCDB");
+  //   man->SetSpecificStorage("MUON/Calib/Mapping","local://$ALICE_ROOT/OCDB");
+  //   man->SetSpecificStorage("MUON/Calib/DDLStore","local://$ALICE_ROOT/OCDB");
 
   // TPC settings
   AliLog::SetClassDebugLevel("AliTPCclustererMI",2);
diff --git a/TPC/recTPC.C b/TPC/recTPC.C
index 2645f8ff443..49087a568e6 100644
--- a/TPC/recTPC.C
+++ b/TPC/recTPC.C
@@ -14,7 +14,7 @@ void recTPC(Int_t type, const char *filename="data.root")
   // type variable = 0 - cosmic test
   //               = 1 - laser test   
   AliCDBManager * man = AliCDBManager::Instance();
-  man->SetDefaultStorage("local://$ALICE_ROOT");
+  man->SetDefaultStorage("local://$ALICE_ROOT/OCDB");
   //man->SetRun(0);
   //man->SetSpecificStorage("TPC/*/*","local:///afs/cern.ch/user/m/mivanov/public/Calib");
   //
@@ -31,7 +31,7 @@ void recTPC(Int_t type, const char *filename="data.root")
   //
   //
   AliReconstruction rec;  
-  rec.SetDefaultStorage("local://$ALICE_ROOT");
+  rec.SetDefaultStorage("local://$ALICE_ROOT/OCDB");
   rec.SetSpecificStorage("TPC/*/*","local:///afs/cern.ch/user/m/mivanov/public/Calib");
   rec.SetLoadAlignData("");
   rec.SetWriteESDfriend(kTRUE);
@@ -54,7 +54,7 @@ void recTracking(Int_t type, const char *filename="data.root")
   // Set path to calibration data
   //
   AliCDBManager * man = AliCDBManager::Instance();
-  man->SetDefaultStorage("local://$ALICE_ROOT");
+  man->SetDefaultStorage("local://$ALICE_ROOT/OCDB");
   man->SetRun(0);
   man->SetSpecificStorage("TPC/*/*","local:///afs/cern.ch/user/m/mivanov/public/Calib");
   //
diff --git a/TPC/testMC/ConfigHM.C b/TPC/testMC/ConfigHM.C
index de9a26024ec..ab12f714013 100644
--- a/TPC/testMC/ConfigHM.C
+++ b/TPC/testMC/ConfigHM.C
@@ -61,7 +61,7 @@ void Config()
     new     TGeant3TGeo("C++ Interface to Geant3");
 
     if(!AliCDBManager::Instance()->IsDefaultStorageSet()){
-      AliCDBManager::Instance()->SetDefaultStorage("local://$ALICE_ROOT");
+      AliCDBManager::Instance()->SetDefaultStorage("local://$ALICE_ROOT/OCDB");
       AliCDBManager::Instance()->SetRun(0);
     }
 
diff --git a/TPC/testMC/ConfigHPT1.C b/TPC/testMC/ConfigHPT1.C
index 9a54d938ae6..bbfb553a3b6 100644
--- a/TPC/testMC/ConfigHPT1.C
+++ b/TPC/testMC/ConfigHPT1.C
@@ -61,7 +61,7 @@ void Config()
     new     TGeant3TGeo("C++ Interface to Geant3");
 
     if(!AliCDBManager::Instance()->IsDefaultStorageSet()){
-      AliCDBManager::Instance()->SetDefaultStorage("local://$ALICE_ROOT");
+      AliCDBManager::Instance()->SetDefaultStorage("local://$ALICE_ROOT/OCDB");
       AliCDBManager::Instance()->SetRun(0);
     }
 
diff --git a/TPC/testMC/ConfigLM.C b/TPC/testMC/ConfigLM.C
index aec18b8746f..85af04042c5 100644
--- a/TPC/testMC/ConfigLM.C
+++ b/TPC/testMC/ConfigLM.C
@@ -61,7 +61,7 @@ void Config()
     new     TGeant3TGeo("C++ Interface to Geant3");
 
     if(!AliCDBManager::Instance()->IsDefaultStorageSet()){
-      AliCDBManager::Instance()->SetDefaultStorage("local://$ALICE_ROOT");
+      AliCDBManager::Instance()->SetDefaultStorage("local://$ALICE_ROOT/OCDB");
       AliCDBManager::Instance()->SetRun(0);
     }
 
diff --git a/TPC/testMC/Config_AliGenCosmicsParam.C b/TPC/testMC/Config_AliGenCosmicsParam.C
index 075cd2af6af..2ae86683d5d 100644
--- a/TPC/testMC/Config_AliGenCosmicsParam.C
+++ b/TPC/testMC/Config_AliGenCosmicsParam.C
@@ -85,7 +85,7 @@ void Config()
     new     TGeant3TGeo("C++ Interface to Geant3");
 
     if(!AliCDBManager::Instance()->IsDefaultStorageSet()){
-      AliCDBManager::Instance()->SetDefaultStorage("local://$ALICE_ROOT");
+      AliCDBManager::Instance()->SetDefaultStorage("local://$ALICE_ROOT/OCDB");
       AliCDBManager::Instance()->SetRun(0);
     }
 
diff --git a/TPC/testMC/sim.C b/TPC/testMC/sim.C
index d431f47d5da..4a694712493 100644
--- a/TPC/testMC/sim.C
+++ b/TPC/testMC/sim.C
@@ -3,7 +3,7 @@ void sim(char * configPath, char * tpcDBpath, Int_t nevents){
   //
   //
   //AliCDBManager * man = AliCDBManager::Instance();
-  //man->SetDefaultStorage("local://$ALICE_ROOT");
+  //man->SetDefaultStorage("local://$ALICE_ROOT/OCDB");
   //man->SetRun(0);
   //man->SetSpecificStorage("TPC/*/*",tpcDBpath);
 
diff --git a/TRD/AliTRDalignment.cxx b/TRD/AliTRDalignment.cxx
index e98c852dcb3..e41c6bec3a8 100644
--- a/TRD/AliTRDalignment.cxx
+++ b/TRD/AliTRDalignment.cxx
@@ -46,7 +46,7 @@
 // TGeoManager::Import("geometry.root"); a.WriteRoot("kuku.root");           //
 // TGeoManager::Import("geometry.root"); a.WriteDB("kukudb.root",0,0);       //
 // TGeoManager::Import("geometry.root");                                     //
-// a.WriteDB("local://$ALICE_ROOT", "TRD/Align/Data", 0,0);                  //
+// a.WriteDB("local://$ALICE_ROOT/OCDB", "TRD/Align/Data", 0,0);                  //
 // TGeoManager::Import("geometry.root"); a.WriteGeo("kukugeometry.root");    //
 //                                                                           //
 // b.ReadAscii("kuku.dat");                                                  //
diff --git a/TRD/Cal/AliTRDCreateDummyCDB.C b/TRD/Cal/AliTRDCreateDummyCDB.C
index 6d243b4ec28..1311bfcced5 100644
--- a/TRD/Cal/AliTRDCreateDummyCDB.C
+++ b/TRD/Cal/AliTRDCreateDummyCDB.C
@@ -216,7 +216,7 @@ void AliTRDCreateDummyCDB()
        << endl;
   
   AliCDBManager *man = AliCDBManager::Instance();
-  gStorLoc = man->GetStorage("local://$ALICE_ROOT");
+  gStorLoc = man->GetStorage("local://$ALICE_ROOT/OCDB");
   if (!gStorLoc) {
     return;
   }
diff --git a/TRD/Cal/AliTRDbenchmarkCalibDB.C b/TRD/Cal/AliTRDbenchmarkCalibDB.C
index 1ca31f9f8aa..5589408a4bd 100644
--- a/TRD/Cal/AliTRDbenchmarkCalibDB.C
+++ b/TRD/Cal/AliTRDbenchmarkCalibDB.C
@@ -25,7 +25,7 @@ extern TRandom* gRandom;
 void AliTRDbenchmarkCalibDB()
 {
   TStopwatch timer;
-  AliCDBManager::Instance()->SetDefaultStorage("local://$ALICE_ROOT");
+  AliCDBManager::Instance()->SetDefaultStorage("local://$ALICE_ROOT/OCDB");
   AliTRDcalibDB* calib = AliTRDcalibDB::Instance();
   if (!calib)
   {
diff --git a/TRD/Cal/AliTRDmakePIDThresholds.C b/TRD/Cal/AliTRDmakePIDThresholds.C
index 5b1137da90d..1ba00c144a7 100644
--- a/TRD/Cal/AliTRDmakePIDThresholds.C
+++ b/TRD/Cal/AliTRDmakePIDThresholds.C
@@ -41,7 +41,7 @@ void AliTRDmakePIDThresholds(TString filename){
   
   AliCDBId id("TRD/Calib/PIDThresholds", 0, AliCDBRunRange::Infinity()); 
   AliCDBManager *man = AliCDBManager::Instance();
-  AliCDBStorage *gStorLoc = man->GetStorage("local://$ALICE_ROOT");
+  AliCDBStorage *gStorLoc = man->GetStorage("local://$ALICE_ROOT/OCDB");
   if (!gStorLoc) {
     return;
   }
diff --git a/TRD/Cal/AliTRDmakeRecoParam.C b/TRD/Cal/AliTRDmakeRecoParam.C
index 4e519cd833e..87b2e4e411e 100644
--- a/TRD/Cal/AliTRDmakeRecoParam.C
+++ b/TRD/Cal/AliTRDmakeRecoParam.C
@@ -10,7 +10,7 @@ void AliTRDmakeRecoParam()
   
   AliCDBId id("TRD/Calib/RecoParam", 0, AliCDBRunRange::Infinity()); 
   AliCDBManager *man = AliCDBManager::Instance();
-  AliCDBStorage *gStorLoc = man->GetStorage("local://$ALICE_ROOT");
+  AliCDBStorage *gStorLoc = man->GetStorage("local://$ALICE_ROOT/OCDB");
   if (!gStorLoc) {
     return;
   }
diff --git a/TRD/Cal/AliTRDplotNoiseBaseline.C b/TRD/Cal/AliTRDplotNoiseBaseline.C
index 0bcbe6063bd..c8d9755d47b 100644
--- a/TRD/Cal/AliTRDplotNoiseBaseline.C
+++ b/TRD/Cal/AliTRDplotNoiseBaseline.C
@@ -38,7 +38,7 @@ void AliTRDplotNoiseBaseline(Int_t run=34529, Int_t sm=0, Int_t det=0, const cha
   //TGrid::Connect("alien://",0,0,"t");
 
   AliCDBManager *CDB = AliCDBManager::Instance();
-  CDB->SetDefaultStorage("local://$ALICE_ROOT"); 
+  CDB->SetDefaultStorage("local://$ALICE_ROOT/OCDB"); 
   CDB->SetSpecificStorage("TRD/Calib/PadNoise",pathdatabase);
   CDB->SetSpecificStorage("TRD/Calib/DetNoise",pathdatabase);
   CDB->SetSpecificStorage("TRD/Calib/PadStatus",pathdatabase);
diff --git a/TRD/Macros/AliTRDCreateVector2DSum.C b/TRD/Macros/AliTRDCreateVector2DSum.C
index 3583587a536..3146c08fa84 100644
--- a/TRD/Macros/AliTRDCreateVector2DSum.C
+++ b/TRD/Macros/AliTRDCreateVector2DSum.C
@@ -40,7 +40,7 @@ Bool_t AliTRDCreateVector2DSum(const char* variablecali, const char* noime, cons
 
   //TRDCalibra
   AliCDBManager *man = AliCDBManager::Instance();
-  man->SetDefaultStorage("local://$ALICE_ROOT");
+  man->SetDefaultStorage("local://$ALICE_ROOT/OCDB");
   man->SetRun(0);
   AliTRDCalibra *calibra = AliTRDCalibra::Instance();
 
diff --git a/TRD/Macros/AliTRDFindTheCoef.C b/TRD/Macros/AliTRDFindTheCoef.C
index 253603cbdb7..346fb98724e 100644
--- a/TRD/Macros/AliTRDFindTheCoef.C
+++ b/TRD/Macros/AliTRDFindTheCoef.C
@@ -28,7 +28,7 @@ void AliTRDFindTheCoef()
   
   ////Set the CDBManager(You have to use the same as during the reconstruction)*************************
   AliCDBManager *man = AliCDBManager::Instance();
-  man->SetDefaultStorage("local://$ALICE_ROOT"); 
+  man->SetDefaultStorage("local://$ALICE_ROOT/OCDB"); 
   man->SetRun(0);
 
   ////Set the parameters of AliTRDCalibra***************
diff --git a/TRD/Macros/AliTRDMergeTwoTrees.C b/TRD/Macros/AliTRDMergeTwoTrees.C
index 164128b0810..45b150644ff 100644
--- a/TRD/Macros/AliTRDMergeTwoTrees.C
+++ b/TRD/Macros/AliTRDMergeTwoTrees.C
@@ -25,7 +25,7 @@ TTree *AliTRDMergeTwoTrees(const char* variablecali){
 
   //Variables
   AliCDBManager *man = AliCDBManager::Instance();
-  man->SetDefaultStorage("local://$ALICE_ROOT");
+  man->SetDefaultStorage("local://$ALICE_ROOT/OCDB");
   man->SetRun(0);
   AliTRDCalibra *calibra = AliTRDCalibra::Instance();
 
diff --git a/TRD/Macros/AliTRDanalyzeTestBeam.C b/TRD/Macros/AliTRDanalyzeTestBeam.C
index 25cfead337b..0059bb9c050 100644
--- a/TRD/Macros/AliTRDanalyzeTestBeam.C
+++ b/TRD/Macros/AliTRDanalyzeTestBeam.C
@@ -61,7 +61,7 @@ void AliTRDanalyzeTestBeam(Int_t run, Int_t begin, Int_t end) {
   // gStyle->SetOptStat(0);
 
   // needed by the AliTRDRawStreamTB
-  AliCDBManager::Instance()->SetDefaultStorage("local://$ALICE_ROOT");
+  AliCDBManager::Instance()->SetDefaultStorage("local://$ALICE_ROOT/OCDB");
   AliTRDcalibDB *calib = AliTRDcalibDB::Instance();
   calib->SetRun(0);
 
diff --git a/TRD/Macros/AliTRDcompareDigits.C b/TRD/Macros/AliTRDcompareDigits.C
index 310e6da0e2e..105ef204784 100644
--- a/TRD/Macros/AliTRDcompareDigits.C
+++ b/TRD/Macros/AliTRDcompareDigits.C
@@ -33,9 +33,9 @@ AliTRDgeometry *gGeo;
 void AliTRDcompareDigits( Int_t id_start = 0 , Int_t id_end = 539 )
 {
   AliCDBManager *cdb = AliCDBManager::Instance();
-  cdb->SetDefaultStorage("local://$ALICE_ROOT");
+  cdb->SetDefaultStorage("local://$ALICE_ROOT/OCDB");
   cdb->SetRun(0);
-  //AliCDBStorage* localStorage = cdb->GetStorage("local://$ALICE_ROOT");
+  //AliCDBStorage* localStorage = cdb->GetStorage("local://$ALICE_ROOT/OCDB");
   //  cout << "[I] Is storage set : " << cdb->IsDefaultStorageSet() << endl;
   cout << endl;
 
diff --git a/TRD/Macros/AliTRDdisplayDigits3D.C b/TRD/Macros/AliTRDdisplayDigits3D.C
index 23a4de15f5a..1b00e73c5c8 100644
--- a/TRD/Macros/AliTRDdisplayDigits3D.C
+++ b/TRD/Macros/AliTRDdisplayDigits3D.C
@@ -60,7 +60,7 @@ Int_t AliTRDdisplayDigits3D(Int_t event = 0, Int_t thresh = 4
   }
 
   AliCDBManager *cdbManager  = AliCDBManager::Instance();
-  cdbManager->SetDefaultStorage("local://$ALICE_ROOT");
+  cdbManager->SetDefaultStorage("local://$ALICE_ROOT/OCDB");
   AliTRDcalibDB *calibration = AliTRDcalibDB::Instance();
   calibration->SetRun(0);
 
diff --git a/TRD/Macros/AliTRDpidCDB.C b/TRD/Macros/AliTRDpidCDB.C
index bb251c4f632..bd0c5e0492f 100644
--- a/TRD/Macros/AliTRDpidCDB.C
+++ b/TRD/Macros/AliTRDpidCDB.C
@@ -16,7 +16,7 @@ void makePIDRefs(const char *dir = ".", const char *file="Refs.root")
 //             "dir" 
 
 	AliCDBManager *man = AliCDBManager::Instance();
-	man->SetDefaultStorage("local://$ALICE_ROOT");
+	man->SetDefaultStorage("local://$ALICE_ROOT/OCDB");
 	man->SetRun(0);
 
 	AliTRDCalPIDRefMaker maker;
@@ -30,10 +30,10 @@ void generatePIDDB(const char *fileNN = "NN.root", const char *fileLQ = "LQ.root
 
 
 	AliCDBManager *man = AliCDBManager::Instance();
-	man->SetDefaultStorage("local://$ALICE_ROOT");
+	man->SetDefaultStorage("local://$ALICE_ROOT/OCDB");
 	man->SetRun(0);
 
-	AliCDBStorage *gStorLoc = man->GetStorage("local://$ALICE_ROOT");
+	AliCDBStorage *gStorLoc = man->GetStorage("local://$ALICE_ROOT/OCDB");
 	if (!gStorLoc) return;
 
   
@@ -69,7 +69,7 @@ AliTRDCalPID* getPIDObject(const char *method="NN")
 	gStyle->SetOptStat(0);
 	
   AliCDBManager *CDBManager = AliCDBManager::Instance();
-	CDBManager->SetDefaultStorage("local://$ALICE_ROOT");
+	CDBManager->SetDefaultStorage("local://$ALICE_ROOT/OCDB");
 	CDBManager->SetRun(0);
 
 	AliCDBEntry *wrap = CDBManager->Get(Form("TRD/Calib/PID%s", method), 0);
diff --git a/TRD/Macros/AliTRDreadRaw.C b/TRD/Macros/AliTRDreadRaw.C
index 182b111a73d..df9e12233fd 100644
--- a/TRD/Macros/AliTRDreadRaw.C
+++ b/TRD/Macros/AliTRDreadRaw.C
@@ -1,7 +1,7 @@
 void AliTRDreadRaw(const char *fname = "raw.root")
 {
   AliCDBManager *cdb = AliCDBManager::Instance();
-  cdb->SetDefaultStorage("local://$ALICE_ROOT");
+  cdb->SetDefaultStorage("local://$ALICE_ROOT/OCDB");
   cdb->SetRun(0);
   
   AliTRDdigitsManager manR;
@@ -29,7 +29,7 @@ void AliTRDreadRaw(const char *fname = "raw.root")
 void readRaw2(const char *fname = "raw.root")
 {
   AliCDBManager *cdb = AliCDBManager::Instance();
-  cdb->SetDefaultStorage("local://$ALICE_ROOT");
+  cdb->SetDefaultStorage("local://$ALICE_ROOT/OCDB");
   cdb->SetRun(0);
 
   AliRawReaderRoot reader(fname, 0);
diff --git a/TRD/Macros/AliTRDreadRaw2Clusters.C b/TRD/Macros/AliTRDreadRaw2Clusters.C
index a107bc3dc4a..5e60d173a4f 100644
--- a/TRD/Macros/AliTRDreadRaw2Clusters.C
+++ b/TRD/Macros/AliTRDreadRaw2Clusters.C
@@ -1,7 +1,7 @@
 void AliTRDreadRaw2Clusters(const char *fname = "raw.root", const char *fnameGeom = "./geometry.root")
 {
   AliCDBManager *cdb = AliCDBManager::Instance();
-  cdb->SetDefaultStorage("local://$ALICE_ROOT");
+  cdb->SetDefaultStorage("local://$ALICE_ROOT/OCDB");
   cdb->SetRun(0);
 
   TFile *fGeometryFile = TFile::Open(fnameGeom);
diff --git a/TRD/Macros/AliTRDtestDigitsRW.C b/TRD/Macros/AliTRDtestDigitsRW.C
index 9a8629feaa9..9546256779a 100644
--- a/TRD/Macros/AliTRDtestDigitsRW.C
+++ b/TRD/Macros/AliTRDtestDigitsRW.C
@@ -13,7 +13,7 @@ void showLegend(TH1F *h, TH1F *h2)
 void AliTRDtestDigitsRW(Int_t thresh = 0, Int_t maxDet = 540)
 {
   AliCDBManager *cdb = AliCDBManager::Instance();
-  cdb->SetDefaultStorage("local://$ALICE_ROOT");
+  cdb->SetDefaultStorage("local://$ALICE_ROOT/OCDB");
   cdb->SetRun(0);
   cout << endl;
 
@@ -191,9 +191,9 @@ void AliTRDtestDigitsRW(Int_t thresh = 0, Int_t maxDet = 540)
 void testDigits2streams()
 {
   AliCDBManager *cdb = AliCDBManager::Instance();
-  cdb->SetDefaultStorage("local://$ALICE_ROOT");
+  cdb->SetDefaultStorage("local://$ALICE_ROOT/OCDB");
   cdb->SetRun(0);
-  //AliCDBStorage* localStorage = cdb->GetStorage("local://$ALICE_ROOT");
+  //AliCDBStorage* localStorage = cdb->GetStorage("local://$ALICE_ROOT/OCDB");
   //  cout << "[I] Is storage set : " << cdb->IsDefaultStorageSet() << endl;
   cout << endl;
 
@@ -322,9 +322,9 @@ void testDigits2streams()
 void printDigits()
 {
   AliCDBManager *cdb = AliCDBManager::Instance();
-  cdb->SetDefaultStorage("local://$ALICE_ROOT");
+  cdb->SetDefaultStorage("local://$ALICE_ROOT/OCDB");
   cdb->SetRun(0);
-  //AliCDBStorage* localStorage = cdb->GetStorage("local://$ALICE_ROOT");
+  //AliCDBStorage* localStorage = cdb->GetStorage("local://$ALICE_ROOT/OCDB");
   //  cout << "[I] Is storage set : " << cdb->IsDefaultStorageSet() << endl;
   cout << endl;
 
diff --git a/TRD/Macros/ReadCDD.C b/TRD/Macros/ReadCDD.C
index 089e397bc0c..1859bf70d9f 100644
--- a/TRD/Macros/ReadCDD.C
+++ b/TRD/Macros/ReadCDD.C
@@ -58,7 +58,7 @@ void ReadCDD(Bool_t residual, Int_t ndet){
   AliCDBManager *man = AliCDBManager::Instance();
  
 
-  man->SetDefaultStorage("local://$ALICE_ROOT");
+  man->SetDefaultStorage("local://$ALICE_ROOT/OCDB");
   man->SetSpecificStorage("TRD/Calib/LocalGainFactor","local://.");
   man->SetSpecificStorage("TRD/Calib/LocalT0","local://.");
   man->SetSpecificStorage("TRD/Calib/LocalVdrift","local://.");
diff --git a/TRD/MakeTRDFullMisAlignment.C b/TRD/MakeTRDFullMisAlignment.C
index dd8ed5a6827..0c5bf98008c 100644
--- a/TRD/MakeTRDFullMisAlignment.C
+++ b/TRD/MakeTRDFullMisAlignment.C
@@ -7,7 +7,7 @@ void MakeTRDFullMisAlignment(){
 
   // Activate CDB storage and load geometry from CDB
   AliCDBManager* cdb = AliCDBManager::Instance();
-  if(!cdb->IsDefaultStorageSet()) cdb->SetDefaultStorage("local://$ALICE_ROOT");
+  if(!cdb->IsDefaultStorageSet()) cdb->SetDefaultStorage("local://$ALICE_ROOT/OCDB");
   cdb->SetRun(0);
   
   AliCDBStorage* storage;
diff --git a/TRD/MakeTRDResMisAlignment.C b/TRD/MakeTRDResMisAlignment.C
index 201edebbce5..830407f7c38 100644
--- a/TRD/MakeTRDResMisAlignment.C
+++ b/TRD/MakeTRDResMisAlignment.C
@@ -7,7 +7,7 @@ void MakeTRDResMisAlignment(){
    
   // Activate CDB storage and load geometry from CDB
   AliCDBManager* cdb = AliCDBManager::Instance();
-  if(!cdb->IsDefaultStorageSet()) cdb->SetDefaultStorage("local://$ALICE_ROOT");
+  if(!cdb->IsDefaultStorageSet()) cdb->SetDefaultStorage("local://$ALICE_ROOT/OCDB");
   cdb->SetRun(0);
   
   AliCDBStorage* storage;
diff --git a/TRD/MakeTRDZeroMisAlignment.C b/TRD/MakeTRDZeroMisAlignment.C
index ccfd10a2580..07f10709754 100644
--- a/TRD/MakeTRDZeroMisAlignment.C
+++ b/TRD/MakeTRDZeroMisAlignment.C
@@ -7,7 +7,7 @@ void MakeTRDZeroMisAlignment(){
    
   // Activate CDB storage and load geometry from CDB
   AliCDBManager* cdb = AliCDBManager::Instance();
-  if(!cdb->IsDefaultStorageSet()) cdb->SetDefaultStorage("local://$ALICE_ROOT");
+  if(!cdb->IsDefaultStorageSet()) cdb->SetDefaultStorage("local://$ALICE_ROOT/OCDB");
   cdb->SetRun(0);
   
   AliCDBStorage* storage = NULL;
diff --git a/TRD/TRDPEDESTALda.cxx b/TRD/TRDPEDESTALda.cxx
index b1ac64e0f1b..50967eed9fb 100644
--- a/TRD/TRDPEDESTALda.cxx
+++ b/TRD/TRDPEDESTALda.cxx
@@ -86,7 +86,7 @@ int main(int argc, char **argv) {
  
   //Instance of AliCDBManager: needed by AliTRDRawStream
   //AliCDBManager *man = AliCDBManager::Instance();
-  //man->SetDefaultStorage("local://$ALICE_ROOT");
+  //man->SetDefaultStorage("local://$ALICE_ROOT/OCDB");
   //man->SetRun(0);
   // AliTRDCalibPadStatus object
   AliTRDCalibPadStatus calipad = AliTRDCalibPadStatus();
diff --git a/TRD/TRDVDRIFTda.cxx b/TRD/TRDVDRIFTda.cxx
index 18a8db0f9e0..5e353329fac 100644
--- a/TRD/TRDVDRIFTda.cxx
+++ b/TRD/TRDVDRIFTda.cxx
@@ -105,7 +105,7 @@ int main(int argc, char **argv) {
 
   //Instance of AliCDBManager: needed by AliTRDRawStreamV2
   //AliCDBManager *man = AliCDBManager::Instance();
-  //man->SetDefaultStorage("local://$ALICE_ROOT");
+  //man->SetDefaultStorage("local://$ALICE_ROOT/OCDB");
   //man->SetRun(0);
   //Instance of AliTRDCalibraFillHisto
   AliTRDCalibraFillHisto *calibra      = AliTRDCalibraFillHisto::Instance();
diff --git a/TRD/TRDcalib/AliTRDcalib.cxx b/TRD/TRDcalib/AliTRDcalib.cxx
index 298625f2c0e..05f4ac30835 100644
--- a/TRD/TRDcalib/AliTRDcalib.cxx
+++ b/TRD/TRDcalib/AliTRDcalib.cxx
@@ -87,7 +87,7 @@ void AliTRDcalib::SlaveBegin(TTree * tree)
   ffriendTrack = 0x0;
 
   AliCDBManager *cdbManager = AliCDBManager::Instance();
-  cdbManager->SetDefaultStorage("local://$ALICE_ROOT");
+  cdbManager->SetDefaultStorage("local://$ALICE_ROOT/OCDB");
   //cdbManager->SetSpecificStorage("TRD/Calib/FEE","local:///u/bailhach/aliroot/database30head/");
   cdbManager->SetRun(0);
 
diff --git a/TRD/TRDcalib/AliTRDcalibV1.cxx b/TRD/TRDcalib/AliTRDcalibV1.cxx
index ffa3342dc6d..5c612d98e21 100644
--- a/TRD/TRDcalib/AliTRDcalibV1.cxx
+++ b/TRD/TRDcalib/AliTRDcalibV1.cxx
@@ -87,7 +87,7 @@ void AliTRDcalibV1::SlaveBegin(TTree * tree)
   ffriendTrack = 0x0;
 
   AliCDBManager *cdbManager = AliCDBManager::Instance();
-  cdbManager->SetDefaultStorage("local://$ALICE_ROOT");
+  cdbManager->SetDefaultStorage("local://$ALICE_ROOT/OCDB");
   //cdbManager->SetSpecificStorage("TRD/Calib/FEE","local:///u/bailhach/aliroot/database30head/");
   cdbManager->SetRun(0);
 
diff --git a/TRD/qaRec/AliTRDclusterResolution.cxx b/TRD/qaRec/AliTRDclusterResolution.cxx
index 346bbc5c87d..ffbc6408522 100644
--- a/TRD/qaRec/AliTRDclusterResolution.cxx
+++ b/TRD/qaRec/AliTRDclusterResolution.cxx
@@ -142,7 +142,7 @@
 // 
 //   // initialize DB manager
 //   AliCDBManager *cdb = AliCDBManager::Instance();
-//   cdb->SetDefaultStorage("local://$ALICE_ROOT");
+//   cdb->SetDefaultStorage("local://$ALICE_ROOT/OCDB");
 //   cdb->SetRun(0);
 //   // initialize magnetic field.
 //   AliMagFCheb *field=new AliMagFCheb("Maps","Maps", 2, 1., 10., AliMagFCheb::k5kG);
diff --git a/TRD/qaRec/run.C b/TRD/qaRec/run.C
index 53ddbaca28c..54cd014b5e0 100644
--- a/TRD/qaRec/run.C
+++ b/TRD/qaRec/run.C
@@ -95,7 +95,7 @@ void run(Char_t *tasks="ALL", const Char_t *files=0x0)
   // DB INITIALIZATION
   // initialize OCDB manager
   AliCDBManager *cdbManager = AliCDBManager::Instance();
-  cdbManager->SetDefaultStorage("local://$ALICE_ROOT");
+  cdbManager->SetDefaultStorage("local://$ALICE_ROOT/OCDB");
   cdbManager->SetRun(0);
   cdbManager->SetCacheFlag(kFALSE);
 
diff --git a/VZERO/AliVZERODigitizer.cxx b/VZERO/AliVZERODigitizer.cxx
index f73ebca0fae..b553282b9ae 100644
--- a/VZERO/AliVZERODigitizer.cxx
+++ b/VZERO/AliVZERODigitizer.cxx
@@ -318,7 +318,7 @@ AliVZEROCalibData* AliVZERODigitizer::GetCalibData() const
 //     AliWarning("Load of calibration data from default storage failed!");
 //     AliWarning("Calibration data will be loaded from local storage ($ALICE_ROOT)");
 //     Int_t runNumber = man->GetRun();
-//     entry = man->GetStorage("local://$ALICE_ROOT")
+//     entry = man->GetStorage("local://$ALICE_ROOT/OCDB")
 //       ->Get("VZERO/Calib/Data",runNumber);
 // 	
 //   }
diff --git a/VZERO/AliVZEROQADataMakerRec.cxx b/VZERO/AliVZEROQADataMakerRec.cxx
index 50f96dbcffb..8103186539e 100644
--- a/VZERO/AliVZEROQADataMakerRec.cxx
+++ b/VZERO/AliVZEROQADataMakerRec.cxx
@@ -98,7 +98,7 @@ AliVZEROCalibData* AliVZEROQADataMakerRec::GetCalibData() const
   
   AliCDBManager *man = AliCDBManager::Instance();
   
-  //man->SetDefaultStorage("local://$ALICE_ROOT");
+  //man->SetDefaultStorage("local://$ALICE_ROOT/OCDB");
 
   AliCDBEntry *entry=0;
   
diff --git a/VZERO/AliVZEROReconstructor.cxx b/VZERO/AliVZEROReconstructor.cxx
index 76721f3e776..2fca0e2e3b6 100644
--- a/VZERO/AliVZEROReconstructor.cxx
+++ b/VZERO/AliVZEROReconstructor.cxx
@@ -288,7 +288,7 @@ AliVZEROCalibData* AliVZEROReconstructor::GetCalibData() const
 //     AliWarning("Load of calibration data from default storage failed!");
 //     AliWarning("Calibration data will be loaded from local storage ($ALICE_ROOT)");
 //     Int_t runNumber = man->GetRun();
-//     entry = man->GetStorage("local://$ALICE_ROOT")
+//     entry = man->GetStorage("local://$ALICE_ROOT/OCDB")
 //       ->Get("VZERO/Calib/Data",runNumber);
 // 	
 //   }
diff --git a/VZERO/DBStorageCalib.C b/VZERO/DBStorageCalib.C
index eb7a348eb5e..a7f02c4075f 100644
--- a/VZERO/DBStorageCalib.C
+++ b/VZERO/DBStorageCalib.C
@@ -4,7 +4,7 @@ void DBStorageCalib(){
 AliCDBManager *man = AliCDBManager::Instance();
 
 AliCDBStorage *storLoc;
-man->SetDefaultStorage("local://$ALICE_ROOT");
+man->SetDefaultStorage("local://$ALICE_ROOT/OCDB");
 
 // Setting gain and pedestal values :
 
diff --git a/VZERO/DBStorageSurvey.C b/VZERO/DBStorageSurvey.C
index 070fc196e1f..a83343f3a59 100644
--- a/VZERO/DBStorageSurvey.C
+++ b/VZERO/DBStorageSurvey.C
@@ -4,7 +4,7 @@ void DBStorageSurvey(){
 AliCDBManager *man = AliCDBManager::Instance();
 
 AliCDBStorage *storLoc;
-man->SetDefaultStorage("local://$ALICE_ROOT");
+man->SetDefaultStorage("local://$ALICE_ROOT/OCDB");
 
 // Setting fake survey values :
 
diff --git a/VZERO/MakeVZEROFullMisAlignment.C b/VZERO/MakeVZEROFullMisAlignment.C
index 0d6e465cd49..9d839415536 100644
--- a/VZERO/MakeVZEROFullMisAlignment.C
+++ b/VZERO/MakeVZEROFullMisAlignment.C
@@ -8,7 +8,7 @@ void MakeVZEROFullMisAlignment(){
 
   // Activate CDB storage and load geometry from CDB
   AliCDBManager* cdb = AliCDBManager::Instance();
-  if(!cdb->IsDefaultStorageSet()) cdb->SetDefaultStorage("local://$ALICE_ROOT");
+  if(!cdb->IsDefaultStorageSet()) cdb->SetDefaultStorage("local://$ALICE_ROOT/OCDB");
   cdb->SetRun(0);
   
   AliCDBStorage* storage;
diff --git a/VZERO/MakeVZEROResMisAlignment.C b/VZERO/MakeVZEROResMisAlignment.C
index ccc7a6a8b0f..7c3b636431c 100644
--- a/VZERO/MakeVZEROResMisAlignment.C
+++ b/VZERO/MakeVZEROResMisAlignment.C
@@ -8,7 +8,7 @@ void MakeVZEROResMisAlignment(){
 
   // Activate CDB storage and load geometry from CDB
   AliCDBManager* cdb = AliCDBManager::Instance();
-  if(!cdb->IsDefaultStorageSet()) cdb->SetDefaultStorage("local://$ALICE_ROOT");
+  if(!cdb->IsDefaultStorageSet()) cdb->SetDefaultStorage("local://$ALICE_ROOT/OCDB");
   cdb->SetRun(0);
   
   AliCDBStorage* storage;
diff --git a/VZERO/VZEROASurveyToAlignment.C b/VZERO/VZEROASurveyToAlignment.C
index f9b4ef7c7a5..a2607f0b907 100644
--- a/VZERO/VZEROASurveyToAlignment.C
+++ b/VZERO/VZEROASurveyToAlignment.C
@@ -258,7 +258,7 @@ void VZEROASurveyToAlignment(){
   }else{
     // save in CDB storage
      AliCDBManager* cdb = AliCDBManager::Instance();
-     AliCDBStorage* storage = cdb->GetStorage("local://$ALICE_ROOT");
+     AliCDBStorage* storage = cdb->GetStorage("local://$ALICE_ROOT/OCDB");
      AliCDBMetaData* mda = new AliCDBMetaData();
      mda->SetResponsible("Lizardo Valencia");
      mda->SetComment("Alignment objects for V0A survey");
diff --git a/VZERO/VZEROSurveyToAlignment.C b/VZERO/VZEROSurveyToAlignment.C
index 842310f253b..314a7facf09 100644
--- a/VZERO/VZEROSurveyToAlignment.C
+++ b/VZERO/VZEROSurveyToAlignment.C
@@ -256,7 +256,7 @@ void VZEROSurveyToAlignment(){
   }else{
     // save in CDB storage
      AliCDBManager* cdb = AliCDBManager::Instance();
-     AliCDBStorage* storage = cdb->GetStorage("local://$ALICE_ROOT");
+     AliCDBStorage* storage = cdb->GetStorage("local://$ALICE_ROOT/OCDB");
      AliCDBMetaData* mda = new AliCDBMetaData();
      mda->SetResponsible("Brigitte Cheynis");
      mda->SetComment("Alignment objects for V0 survey");
diff --git a/ZDC/MakeZDCRecoParam.C b/ZDC/MakeZDCRecoParam.C
index 88cb45f63a8..00f2cbfd571 100644
--- a/ZDC/MakeZDCRecoParam.C
+++ b/ZDC/MakeZDCRecoParam.C
@@ -10,7 +10,7 @@ void MakeZDCRecoParam(Int_t type=0){
 
   AliCDBManager* cdb = AliCDBManager::Instance();
   //if(!cdb->IsDefaultStorageSet()) cdb->SetDefaultStorage("local://OCDB");
-  cdb->SetDefaultStorage("local://$ALICE_ROOT");
+  cdb->SetDefaultStorage("local://$ALICE_ROOT/OCDB");
   
   AliZDCRecoParam *zdcRecoParam = 0;
   //
diff --git a/ZDC/TestZDCPreprocessor.C b/ZDC/TestZDCPreprocessor.C
index 2f32fe7dc10..280de423d52 100644
--- a/ZDC/TestZDCPreprocessor.C
+++ b/ZDC/TestZDCPreprocessor.C
@@ -19,8 +19,8 @@ void TestZDCPreprocessor(Int_t obj=0)
 
   // TODO if needed, change location of OCDB and Reference test folders
   // by default they are set to $ALICE_ROOT/SHUTTLE/TestShuttle/TestCDB and TestReference
-  AliTestShuttle::SetMainCDB("local://$ALICE_ROOT/SHUTTLE/TestShuttle/TestCDB");
-  AliTestShuttle::SetMainRefStorage("local://$ALICE_ROOT/SHUTTLE/TestShuttle/TestReference");
+  AliTestShuttle::SetMainCDB("local://$ALICE_ROOT/OCDB/SHUTTLE/TestShuttle/TestCDB");
+  AliTestShuttle::SetMainRefStorage("local://$ALICE_ROOT/OCDB/SHUTTLE/TestShuttle/TestReference");
 
   printf("Test OCDB storage Uri: %s\n", AliShuttleInterface::GetMainCDB().Data());
   printf("Test Reference storage Uri: %s\n", AliShuttleInterface::GetMainRefStorage().Data());
@@ -281,7 +281,7 @@ void WriteDCSAliasMap()
   AliCDBId id("ZDC/DCS/Data", 0, 0);
 
   // initialize location of CDB
-  AliCDBManager::Instance()->SetDefaultStorage("local://$ALICE_ROOT/SHUTTLE/TestShuttle/TestCDB");
+  AliCDBManager::Instance()->SetDefaultStorage("local://$ALICE_ROOT/OCDB/SHUTTLE/TestShuttle/TestCDB");
 
   AliCDBManager::Instance()->Put(dcsAliasMap, id, &metaData);
 }
diff --git a/macros/Config.C b/macros/Config.C
index 57ebd413c85..cd133ce572f 100644
--- a/macros/Config.C
+++ b/macros/Config.C
@@ -89,11 +89,11 @@ void Config()
 	 cout << "#####################################################" << endl;
 	 cout << "#                                                   #" << endl;
 	 cout << "#     WARNING: CDB DEFAULT STORAGE NOT SET !!!      #" << endl;
-	 cout << "#     SETTING IT TO local://$ALICE_ROOT !!!         #" << endl;
+	 cout << "#     SETTING IT TO local://$ALICE_ROOT/OCDB !!!         #" << endl;
 	 cout << "#                                                   #" << endl;
 	 cout << "#####################################################" << endl;
           
-         AliCDBManager::Instance()->SetDefaultStorage("local://$ALICE_ROOT");
+         AliCDBManager::Instance()->SetDefaultStorage("local://$ALICE_ROOT/OCDB");
     }
     
     if(AliCDBManager::Instance()->GetRun() < 0){
diff --git a/macros/ConfigBeautyPPR.C b/macros/ConfigBeautyPPR.C
index d25f541f0af..18638a727f6 100644
--- a/macros/ConfigBeautyPPR.C
+++ b/macros/ConfigBeautyPPR.C
@@ -61,7 +61,7 @@ void Config()
   //  Create the output file
    
   if(!AliCDBManager::Instance()->IsDefaultStorageSet()){
-    AliCDBManager::Instance()->SetDefaultStorage("local://$ALICE_ROOT");
+    AliCDBManager::Instance()->SetDefaultStorage("local://$ALICE_ROOT/OCDB");
     AliCDBManager::Instance()->SetRun(0);
   }
   
diff --git a/macros/ConfigCharmPPR.C b/macros/ConfigCharmPPR.C
index 5240b3b19db..cf44e9eb979 100644
--- a/macros/ConfigCharmPPR.C
+++ b/macros/ConfigCharmPPR.C
@@ -58,7 +58,7 @@ void Config()
   new TGeant3TGeo("C++ Interface to Geant3");
 
   if(!AliCDBManager::Instance()->IsDefaultStorageSet()){
-    AliCDBManager::Instance()->SetDefaultStorage("local://$ALICE_ROOT");
+    AliCDBManager::Instance()->SetDefaultStorage("local://$ALICE_ROOT/OCDB");
     AliCDBManager::Instance()->SetRun(0);
   }
 
diff --git a/macros/ConfigHBT.C b/macros/ConfigHBT.C
index f5b973ef4dc..66d9dab69e1 100644
--- a/macros/ConfigHBT.C
+++ b/macros/ConfigHBT.C
@@ -56,7 +56,7 @@ void Config()
     new     TGeant3TGeo("C++ Interface to Geant3");
 
     if(!AliCDBManager::Instance()->IsDefaultStorageSet()){
-      AliCDBManager::Instance()->SetDefaultStorage("local://$ALICE_ROOT");
+      AliCDBManager::Instance()->SetDefaultStorage("local://$ALICE_ROOT/OCDB");
       AliCDBManager::Instance()->SetRun(0);
     }
 
diff --git a/macros/ConfigPPR.C b/macros/ConfigPPR.C
index dc363adfc2d..4bc2c61705a 100644
--- a/macros/ConfigPPR.C
+++ b/macros/ConfigPPR.C
@@ -157,7 +157,7 @@ void Config()
     new     TGeant3TGeo("C++ Interface to Geant3");
 
     if(!AliCDBManager::Instance()->IsDefaultStorageSet()){
-      AliCDBManager::Instance()->SetDefaultStorage("local://$ALICE_ROOT");
+      AliCDBManager::Instance()->SetDefaultStorage("local://$ALICE_ROOT/OCDB");
       AliCDBManager::Instance()->SetRun(0);
     }
 
diff --git a/macros/Config_AliGenCosmicsParam.C b/macros/Config_AliGenCosmicsParam.C
index 7013bd2d1e1..377d1899cf9 100644
--- a/macros/Config_AliGenCosmicsParam.C
+++ b/macros/Config_AliGenCosmicsParam.C
@@ -77,7 +77,7 @@ void Config()
     new     TGeant3TGeo("C++ Interface to Geant3");
 
     if(!AliCDBManager::Instance()->IsDefaultStorageSet()){
-      AliCDBManager::Instance()->SetDefaultStorage("local://$ALICE_ROOT");
+      AliCDBManager::Instance()->SetDefaultStorage("local://$ALICE_ROOT/OCDB");
       AliCDBManager::Instance()->SetRun(0);
     }
 
diff --git a/macros/Config_PDC06.C b/macros/Config_PDC06.C
index eeecbbcecf1..44f22d3d0f3 100644
--- a/macros/Config_PDC06.C
+++ b/macros/Config_PDC06.C
@@ -162,7 +162,7 @@ void Config()
   new TGeant3TGeo("C++ Interface to Geant3");
 
   if(!AliCDBManager::Instance()->IsDefaultStorageSet()){
-    AliCDBManager::Instance()->SetDefaultStorage("local://$ALICE_ROOT");
+    AliCDBManager::Instance()->SetDefaultStorage("local://$ALICE_ROOT/OCDB");
     AliCDBManager::Instance()->SetRun(0);
   }
 
diff --git a/macros/Config_PDC06_MUON.C b/macros/Config_PDC06_MUON.C
index a8dac21667c..d8a7c7d5441 100644
--- a/macros/Config_PDC06_MUON.C
+++ b/macros/Config_PDC06_MUON.C
@@ -19,7 +19,7 @@ void Config(char directory[100]="", char option[6]="trg1mu")
   //=======================================================================
 
   if(!AliCDBManager::Instance()->IsDefaultStorageSet()){
-    AliCDBManager::Instance()->SetDefaultStorage("local://$ALICE_ROOT");
+    AliCDBManager::Instance()->SetDefaultStorage("local://$ALICE_ROOT/OCDB");
     AliCDBManager::Instance()->SetRun(0);
   }
   
diff --git a/macros/Config_PDC07_MBias_MUON.C b/macros/Config_PDC07_MBias_MUON.C
index 8eb76c84209..fd03f43412f 100644
--- a/macros/Config_PDC07_MBias_MUON.C
+++ b/macros/Config_PDC07_MBias_MUON.C
@@ -21,7 +21,7 @@ void Config(char directory[100]="", char option[6]="trgAll")
   //=======================================================================
 
     if(!AliCDBManager::Instance()->IsDefaultStorageSet()){
-	AliCDBManager::Instance()->SetDefaultStorage("local://$ALICE_ROOT");
+	AliCDBManager::Instance()->SetDefaultStorage("local://$ALICE_ROOT/OCDB");
 	AliCDBManager::Instance()->SetRun(0);
     }
 
diff --git a/macros/Config_PythiaHeavyFlavours.C b/macros/Config_PythiaHeavyFlavours.C
index 5cce0891dad..9e5b5e7c108 100644
--- a/macros/Config_PythiaHeavyFlavours.C
+++ b/macros/Config_PythiaHeavyFlavours.C
@@ -144,7 +144,7 @@ void Config()
   new TGeant3TGeo("C++ Interface to Geant3");
 
   if(!AliCDBManager::Instance()->IsDefaultStorageSet()){
-    AliCDBManager::Instance()->SetDefaultStorage("local://$ALICE_ROOT");
+    AliCDBManager::Instance()->SetDefaultStorage("local://$ALICE_ROOT/OCDB");
     AliCDBManager::Instance()->SetRun(0);
   }
   
diff --git a/macros/MakeAllDETsFullMisAlignment.C b/macros/MakeAllDETsFullMisAlignment.C
index 6263ea694d0..b4e4df9c553 100644
--- a/macros/MakeAllDETsFullMisAlignment.C
+++ b/macros/MakeAllDETsFullMisAlignment.C
@@ -28,7 +28,7 @@ void MakeAllDETsFullMisAlignment(Char_t* CDBstorage = "local://$HOME/FullMisAlig
   // Load geometry from CDB updating it if we are producing the
   // alignment objects for the CDB
   AliCDBManager* cdb = AliCDBManager::Instance();
-  if(!cdb->IsDefaultStorageSet()) cdb->SetDefaultStorage("local://$ALICE_ROOT");
+  if(!cdb->IsDefaultStorageSet()) cdb->SetDefaultStorage("local://$ALICE_ROOT/OCDB");
   cdb->SetRun(0);
   
   if(strStorage.IsNull()){ //if we produce the objects into a file
diff --git a/macros/MakeAllDETsResMisAlignment.C b/macros/MakeAllDETsResMisAlignment.C
index 4b331742b6d..381fa2a83a2 100644
--- a/macros/MakeAllDETsResMisAlignment.C
+++ b/macros/MakeAllDETsResMisAlignment.C
@@ -28,7 +28,7 @@ void MakeAllDETsResMisAlignment(Char_t* CDBstorage = "local://$HOME/ResidualMisA
   // Load geometry from CDB updating it if we are producing the
   // alignment objects for the CDB
   AliCDBManager* cdb = AliCDBManager::Instance();
-  if(!cdb->IsDefaultStorageSet()) cdb->SetDefaultStorage("local://$ALICE_ROOT");
+  if(!cdb->IsDefaultStorageSet()) cdb->SetDefaultStorage("local://$ALICE_ROOT/OCDB");
   cdb->SetRun(0);
   
   if(strStorage.IsNull()){ //if we produce the objects into a file
diff --git a/macros/MakeAllDETsZeroMisAlignment.C b/macros/MakeAllDETsZeroMisAlignment.C
index 1e328793114..a515f5a5198 100644
--- a/macros/MakeAllDETsZeroMisAlignment.C
+++ b/macros/MakeAllDETsZeroMisAlignment.C
@@ -25,7 +25,7 @@ void MakeAllDETsZeroMisAlignment(Char_t* CDBstorage = "local://$HOME/ZeroMisAlig
   // Load geometry from CDB updating it if we are producing the
   // alignment objects for the CDB
   AliCDBManager* cdb = AliCDBManager::Instance();
-  if(!cdb->IsDefaultStorageSet()) cdb->SetDefaultStorage("local://$ALICE_ROOT");
+  if(!cdb->IsDefaultStorageSet()) cdb->SetDefaultStorage("local://$ALICE_ROOT/OCDB");
   cdb->SetRun(0);
   
   if(strStorage.IsNull()){ //if we produce the objects into a file
diff --git a/macros/g4menu.C b/macros/g4menu.C
index e55f474dd50..7a2e7579448 100644
--- a/macros/g4menu.C
+++ b/macros/g4menu.C
@@ -65,7 +65,7 @@ void g4menu()
 void MakeGeometry()
 {  
   AliCDBManager* man = AliCDBManager::Instance();
-  man->SetDefaultStorage("local://$ALICE_ROOT");
+  man->SetDefaultStorage("local://$ALICE_ROOT/OCDB");
   man->SetRun(1);
   gAlice->Init("$ALICE_ROOT/macros/g4ConfigGeometry.C");
   
@@ -84,7 +84,7 @@ void MakeGeometry()
 void Init()
 {  
   AliCDBManager* man = AliCDBManager::Instance();
-  man->SetDefaultStorage("local://$ALICE_ROOT");
+  man->SetDefaultStorage("local://$ALICE_ROOT/OCDB");
   man->SetRun(0);
   gAlice->Init("$ALICE_ROOT/macros/g4Config.C");
 
diff --git a/prod/LHC08d6/Config.C b/prod/LHC08d6/Config.C
index 8f99eeb98e1..9997ff484e4 100644
--- a/prod/LHC08d6/Config.C
+++ b/prod/LHC08d6/Config.C
@@ -127,11 +127,11 @@ void Config()
 	 cout << "#####################################################" << endl;
 	 cout << "#                                                   #" << endl;
 	 cout << "#     WARNING: CDB DEFAULT STORAGE NOT SET !!!      #" << endl;
-	 cout << "#     SETTING IT TO local://$ALICE_ROOT !!!         #" << endl;
+	 cout << "#     SETTING IT TO local://$ALICE_ROOT/OCDB !!!         #" << endl;
 	 cout << "#                                                   #" << endl;
 	 cout << "#####################################################" << endl;
 
-         AliCDBManager::Instance()->SetDefaultStorage("local://$ALICE_ROOT");
+         AliCDBManager::Instance()->SetDefaultStorage("local://$ALICE_ROOT/OCDB");
     }
 
     if(AliCDBManager::Instance()->GetRun() < 0){
diff --git a/test/PbPbbench/rec.C b/test/PbPbbench/rec.C
index 2a9a5a3a7bc..7d4db5568b6 100644
--- a/test/PbPbbench/rec.C
+++ b/test/PbPbbench/rec.C
@@ -4,12 +4,12 @@ void rec() {
   reco.SetWriteESDfriend();
   reco.SetWriteAlignmentData();
 
-  reco.SetDefaultStorage("local://$ALICE_ROOT");
+  reco.SetDefaultStorage("local://$ALICE_ROOT/OCDB");
   reco.SetSpecificStorage("GRP/GRP/Data",
 			  Form("local://%s",gSystem->pwd()));
   reco.SetRunQA("ALL:ALL") ;
   
-  AliQA::SetQARefStorage("local://$ALICE_ROOT") ;
+  AliQA::SetQARefStorage("local://$ALICE_ROOT/OCDB") ;
   
   for (Int_t det = 0 ; det < AliQA::kNDET ; det++) {
     reco.SetQACycles(det, 999) ;
diff --git a/test/PbPbbench/recraw/rec.C b/test/PbPbbench/recraw/rec.C
index 96c74f1fbc9..f4e66cf6255 100644
--- a/test/PbPbbench/recraw/rec.C
+++ b/test/PbPbbench/recraw/rec.C
@@ -6,7 +6,7 @@ void rec() {
   reco.SetWriteESDfriend();
   reco.SetWriteAlignmentData();
 
-  reco.SetDefaultStorage("local://$ALICE_ROOT");
+  reco.SetDefaultStorage("local://$ALICE_ROOT/OCDB");
   reco.SetSpecificStorage("GRP/GRP/Data",
 			  Form("local://%s/..",gSystem->pwd()));
 
diff --git a/test/PbPbbench/sim.C b/test/PbPbbench/sim.C
index bac9dbe57e4..6cbe042efa5 100644
--- a/test/PbPbbench/sim.C
+++ b/test/PbPbbench/sim.C
@@ -4,11 +4,11 @@ void sim(Int_t nev=1) {
    nev = atoi(gSystem->Getenv("EVENT")) ;   
   simulator.SetWriteRawData("ALL","raw.root",kTRUE);
 
-  simulator.SetDefaultStorage("local://$ALICE_ROOT");
+  simulator.SetDefaultStorage("local://$ALICE_ROOT/OCDB");
   simulator.SetSpecificStorage("GRP/GRP/Data",
 			       Form("local://%s",gSystem->pwd()));
   simulator.SetRunQA("ALL:ALL") ; 
-  AliQA::SetQARefStorage("local://$ALICE_ROOT") ;
+  AliQA::SetQARefStorage("local://$ALICE_ROOT/OCDB") ;
   
   for (Int_t det = 0 ; det < AliQA::kNDET ; det++) {
     simulator.SetQACycles(det, nev+1) ;
diff --git a/test/QA/Save2OCDB.C b/test/QA/Save2OCDB.C
index d1c8ddf0636..b5e39138ecc 100644
--- a/test/QA/Save2OCDB.C
+++ b/test/QA/Save2OCDB.C
@@ -4,7 +4,7 @@ void Save2OCDB(Int_t runNumber=0)
   const char * kYear = "08" ; 
   // where ? 
   //AliQA::SetQARefStorage(Form("%s%s/", AliQA::GetQARefDefaultStorage(), kYear)) ;
-  AliQA::SetQARefStorage("local://$ALICE_ROOT") ;
+  AliQA::SetQARefStorage("local://$ALICE_ROOT/OCDB") ;
   AliQA::SetQARefDataDirName(AliQA::kMONTECARLO) ; //RUN_TYPE
   AliQADataMakerSteer qas ; 
   qas.Save2OCDB(runNumber) ; 
diff --git a/test/QA/rawqa.C b/test/QA/rawqa.C
index d5f2a5072a1..240d25fa7fc 100644
--- a/test/QA/rawqa.C
+++ b/test/QA/rawqa.C
@@ -27,7 +27,7 @@ void rawqa(const Int_t runNumber, Int_t maxFiles = 10, const char* year = "08")
 {	
 	char * kDefaultOCDBStorage = Form("alien://folder=/alice/data/20%s/LHC%sd/OCDB/", year, year) ; 
 	//AliQA::SetQARefStorage(Form("%s%s/", AliQA::GetQARefDefaultStorage(), year)) ;  
-	AliQA::SetQARefStorage("local://$ALICE_ROOT") ;
+	AliQA::SetQARefStorage("local://$ALICE_ROOT/OCDB") ;
 	AliQA::SetQARefDataDirName(AliQA::kMONTECARLO) ; //RUN_TYPE
 	
 	UInt_t maxEvents = 99999 ;
diff --git a/test/QA/rec.C b/test/QA/rec.C
index 168f6b33869..4041f0de108 100644
--- a/test/QA/rec.C
+++ b/test/QA/rec.C
@@ -4,7 +4,7 @@
 
   reco.SetWriteESDfriend();
   reco.SetWriteAlignmentData();
-  reco.SetDefaultStorage("local://$ALICE_ROOT");
+  reco.SetDefaultStorage("local://$ALICE_ROOT/OCDB");
   reco.SetSpecificStorage("GRP/GRP/Data",
 			  Form("local://%s",gSystem->pwd()));
 
@@ -12,7 +12,7 @@
 
   reco.SetRunQA("ALL:ALL") ;
 	  
-  AliQA::SetQARefStorage("local://$ALICE_ROOT") ;
+  AliQA::SetQARefStorage("local://$ALICE_ROOT/OCDB") ;
   
   for (Int_t det = 0 ; det < AliQA::kNDET ; det++) {
     reco.SetQACycles(det, 999) ;
diff --git a/test/QA/recqa.C b/test/QA/recqa.C
index fa5090daa93..c0d9932bdee 100644
--- a/test/QA/recqa.C
+++ b/test/QA/recqa.C
@@ -5,12 +5,12 @@ void recqa()
 	gEnv->SetValue("Root.Stacktrace","no");
 	AliCDBManager * man = AliCDBManager::Instance();
 	//man->SetDefaultStorage("alien://Folder=/alice/data/2008/LHC08d/OCDB/") ; 
-	man->SetDefaultStorage("local://$ALICE_ROOT");
+	man->SetDefaultStorage("local://$ALICE_ROOT/OCDB");
   man.SetSpecificStorage("GRP/GRP/Data",Form("local://%s",gSystem->pwd()));
 	TString detectors("ITS TPC TRD TOF PHOS HMPID EMCAL/*MUON*/ FMD ZDC PMD T0 VZERO");
 	
 	//AliQA::SetQARefStorage(Form("%s%s/", AliQA::GetQARefDefaultStorage(), kYear)) ;
-	AliQA::SetQARefStorage("local://$ALICE_ROOT") ;
+	AliQA::SetQARefStorage("local://$ALICE_ROOT/OCDB") ;
 	//AliQA::SetQARefDataDirName(AliQA::kMONTECARLO) ; //RUN_TYPE
    
   AliQADataMakerSteer qas("rec") ; 
diff --git a/test/QA/recraw.C b/test/QA/recraw.C
index b6404fb162e..545796e9d34 100644
--- a/test/QA/recraw.C
+++ b/test/QA/recraw.C
@@ -7,7 +7,7 @@ void recraw() {
   reco.SetWriteAlignmentData();
   reco.SetInput("raw.root");
 
-  reco.SetDefaultStorage("local://$ALICE_ROOT");
+  reco.SetDefaultStorage("local://$ALICE_ROOT/OCDB");
   reco.SetSpecificStorage("GRP/GRP/Data",
 			  Form("local://%s/..",gSystem->pwd()));
 
@@ -22,7 +22,7 @@ void recraw() {
 	
   reco.SetRunQA("ALL:ALL") ;
 
-  AliQA::SetQARefStorage("local://$ALICE_ROOT") ;
+  AliQA::SetQARefStorage("local://$ALICE_ROOT/OCDB") ;
   for (Int_t det = 0 ; det < AliQA::kNDET ; det++) {
     reco.SetQACycles(det, 9999) ;
     reco.SetQAWriteExpert(det) ; 
diff --git a/test/QA/sim.C b/test/QA/sim.C
index 4f1e83cb2f4..d7f2e65c8b8 100644
--- a/test/QA/sim.C
+++ b/test/QA/sim.C
@@ -4,12 +4,12 @@ void sim(Int_t nev=1) {
   simu.SetMakeDigits ("TRD TOF PHOS HMPID  EMCAL MUON FMD PMD T0 ZDC VZERO");
   simu.SetMakeDigitsFromHits("ITS TPC");
   simu.SetWriteRawData("ALL","raw.root",kTRUE);
-  simu.SetDefaultStorage("local://$ALICE_ROOT");
+  simu.SetDefaultStorage("local://$ALICE_ROOT/OCDB");
   simu.SetSpecificStorage("GRP/GRP/Data",
 			  Form("local://%s",gSystem->pwd()));
 
   simu.SetRunQA("ALL:ALL") ; 
-  AliQA::SetQARefStorage("local://$ALICE_ROOT") ;
+  AliQA::SetQARefStorage("local://$ALICE_ROOT/OCDB") ;
 
   for (Int_t det = 0 ; det < AliQA::kNDET ; det++) {
     simu.SetQACycles(det, 2) ;
diff --git a/test/QA/simqa.C b/test/QA/simqa.C
index 40b1b36ce28..f23f80fb607 100644
--- a/test/QA/simqa.C
+++ b/test/QA/simqa.C
@@ -5,11 +5,11 @@ void simqa()
 	gEnv->SetValue("Root.Stacktrace","no");
 	AliCDBManager * man = AliCDBManager::Instance();
 	//man->SetDefaultStorage("alien://Folder=/alice/data/2008/LHC08d/OCDB/");
-	man->SetDefaultStorage("local://$ALICE_ROOT");
+	man->SetDefaultStorage("local://$ALICE_ROOT/OCDB");
 	TString detectors("ITS TPC TRD TOF PHOS HMPID EMCAL MUON FMD PMD ZDC T0 VZERO"); 
 	
 	//AliQA::SetQARefStorage(Form("%s%s/", AliQA::GetQARefDefaultStorage(), kYear)) ;
-	AliQA::SetQARefStorage("local://$ALICE_ROOT") ;
+	AliQA::SetQARefStorage("local://$ALICE_ROOT/OCDB") ;
 //	AliQA::SetQARefDataDirName(AliQA::kMONTECARLO) ; //RUN_TYPE
   
 
diff --git a/test/cosmic/rawqa.C b/test/cosmic/rawqa.C
index ad1acb34ed1..08ca53be4e2 100644
--- a/test/cosmic/rawqa.C
+++ b/test/cosmic/rawqa.C
@@ -45,7 +45,7 @@ void rawqa(const char * filename)
 
   // set the location of reference data 
   //AliQA::SetQARefStorage(Form("%s%s/", AliQA::GetQARefDefaultStorage(), year)) ;  
-  AliQA::SetQARefStorage("local://$ALICE_ROOT") ;
+  AliQA::SetQARefStorage("local://$ALICE_ROOT/OCDB") ;
 	
   AliLog::SetGlobalDebugLevel(0) ; 
 	
diff --git a/test/cosmic/rec.C b/test/cosmic/rec.C
index f73fa2ed753..5985d89befb 100644
--- a/test/cosmic/rec.C
+++ b/test/cosmic/rec.C
@@ -17,12 +17,12 @@ void rec(const char *filename="raw.root", const Int_t mfield=1)
 
   // Set the CDB storage location
   AliCDBManager * man = AliCDBManager::Instance();
-    man->SetDefaultStorage("local://$ALICE_ROOT");
+    man->SetDefaultStorage("local://$ALICE_ROOT/OCDB");
   //man->SetDefaultStorage("alien://folder=/alice/data/2008/LHC08a/OCDB/");
-  man->SetSpecificStorage("ITS/Calib/*","local://$ALICE_ROOT");
+  man->SetSpecificStorage("ITS/Calib/*","local://$ALICE_ROOT/OCDB");
   
   // Example in case a specific CDB storage is needed
-  //  man->SetSpecificStorage("ITS/Calib/MapsAnodeSDD","local://$ALICE_ROOT");
+  //  man->SetSpecificStorage("ITS/Calib/MapsAnodeSDD","local://$ALICE_ROOT/OCDB");
 
   // Reconstruction settings
   AliReconstruction rec;
diff --git a/test/fpprod/rec.C b/test/fpprod/rec.C
index 5260ff5c74e..ebed8d3fbee 100644
--- a/test/fpprod/rec.C
+++ b/test/fpprod/rec.C
@@ -10,7 +10,7 @@ void rec() {
   reco.SetWriteESDfriend();
   reco.SetWriteAlignmentData();
 
-  reco.SetDefaultStorage("local://$ALICE_ROOT");
+  reco.SetDefaultStorage("local://$ALICE_ROOT/OCDB");
   reco.SetSpecificStorage("GRP/GRP/Data",
 			  Form("local://%s",gSystem->pwd()));
 
diff --git a/test/fpprod/sim.C b/test/fpprod/sim.C
index 5b46e438d04..446d34018bf 100644
--- a/test/fpprod/sim.C
+++ b/test/fpprod/sim.C
@@ -13,7 +13,7 @@ void sim(Int_t nev=50) {
     simulator.SetWriteRawData("ALL","raw.root",kTRUE);
   }
 
-  simulator.SetDefaultStorage("local://$ALICE_ROOT");
+  simulator.SetDefaultStorage("local://$ALICE_ROOT/OCDB");
   simulator.SetSpecificStorage("GRP/GRP/Data",
 			       Form("local://%s",gSystem->pwd()));
  
diff --git a/test/genkine/sim/rec.C b/test/genkine/sim/rec.C
index 4e765bd196b..5074da891b2 100644
--- a/test/genkine/sim/rec.C
+++ b/test/genkine/sim/rec.C
@@ -2,7 +2,7 @@ void rec() {
   AliReconstruction reco;
 
 
-  reco.SetDefaultStorage("local://$ALICE_ROOT");
+  reco.SetDefaultStorage("local://$ALICE_ROOT/OCDB");
   reco.SetSpecificStorage("GRP/GRP/Data",
 			  Form("local://%s",gSystem->pwd()));
 
diff --git a/test/genkine/sim/sim.C b/test/genkine/sim/sim.C
index 1eccc15669a..44e92cc065e 100644
--- a/test/genkine/sim/sim.C
+++ b/test/genkine/sim/sim.C
@@ -1,7 +1,7 @@
 void sim(Int_t nev=1) {
   AliSimulation simulator;
 
-  simulator.SetDefaultStorage("local://$ALICE_ROOT");
+  simulator.SetDefaultStorage("local://$ALICE_ROOT/OCDB");
   simulator.SetSpecificStorage("GRP/GRP/Data",
 			       Form("local://%s",gSystem->pwd()));
 
diff --git a/test/gun/rec.C b/test/gun/rec.C
index 6da03f96caf..e576eacdd6d 100644
--- a/test/gun/rec.C
+++ b/test/gun/rec.C
@@ -4,7 +4,7 @@ void rec() {
   reco.SetWriteESDfriend();
   reco.SetWriteAlignmentData();
 
-  reco.SetDefaultStorage("local://$ALICE_ROOT");
+  reco.SetDefaultStorage("local://$ALICE_ROOT/OCDB");
   reco.SetSpecificStorage("GRP/GRP/Data",
 			  Form("local://%s",gSystem->pwd()));
 
diff --git a/test/gun/recraw/rec.C b/test/gun/recraw/rec.C
index 0b1a95d3567..a1f991f2b24 100644
--- a/test/gun/recraw/rec.C
+++ b/test/gun/recraw/rec.C
@@ -5,7 +5,7 @@ void rec() {
   reco.SetWriteESDfriend();
   reco.SetWriteAlignmentData();
 
-  reco.SetDefaultStorage("local://$ALICE_ROOT");
+  reco.SetDefaultStorage("local://$ALICE_ROOT/OCDB");
   reco.SetSpecificStorage("GRP/GRP/Data",
 			  Form("local://%s/..",gSystem->pwd()));
 
diff --git a/test/gun/sim.C b/test/gun/sim.C
index 92f57fad3d1..4f8777ca25b 100644
--- a/test/gun/sim.C
+++ b/test/gun/sim.C
@@ -5,7 +5,7 @@ void sim(Int_t nev=4) {
   simulator.SetMakeDigitsFromHits("ITS TPC");
   simulator.SetWriteRawData("ALL","raw.root",kTRUE);
 
-  simulator.SetDefaultStorage("local://$ALICE_ROOT");
+  simulator.SetDefaultStorage("local://$ALICE_ROOT/OCDB");
   simulator.SetSpecificStorage("GRP/GRP/Data",
 			       Form("local://%s",gSystem->pwd()));
 
diff --git a/test/merge/backgr/rec.C b/test/merge/backgr/rec.C
index 10b3d6da22b..b0bb1b0db04 100644
--- a/test/merge/backgr/rec.C
+++ b/test/merge/backgr/rec.C
@@ -4,7 +4,7 @@ void rec() {
   reco.SetWriteESDfriend();
   reco.SetWriteAlignmentData();
 
-  reco.SetDefaultStorage("local://$ALICE_ROOT");
+  reco.SetDefaultStorage("local://$ALICE_ROOT/OCDB");
   reco.SetSpecificStorage("GRP/GRP/Data",
 			  Form("local://%s",gSystem->pwd()));
  
diff --git a/test/merge/backgr/sim.C b/test/merge/backgr/sim.C
index 7294dd7efd2..ac9bc3f1c5c 100644
--- a/test/merge/backgr/sim.C
+++ b/test/merge/backgr/sim.C
@@ -2,7 +2,7 @@ void sim(Int_t nev=1) {
   AliSimulation simulator;
   simulator.SetWriteRawData("ALL","raw.root",kTRUE);
 
-  simulator.SetDefaultStorage("local://$ALICE_ROOT");
+  simulator.SetDefaultStorage("local://$ALICE_ROOT/OCDB");
   simulator.SetSpecificStorage("GRP/GRP/Data",
 			       Form("local://%s",gSystem->pwd()));
 
diff --git a/test/merge/signal/rec.C b/test/merge/signal/rec.C
index adc88a1e667..a42db1544f0 100644
--- a/test/merge/signal/rec.C
+++ b/test/merge/signal/rec.C
@@ -4,7 +4,7 @@ void rec() {
   reco.SetWriteAlignmentData();
 
   // Use the GRP from the backgr
-  reco.SetDefaultStorage("local://$ALICE_ROOT");
+  reco.SetDefaultStorage("local://$ALICE_ROOT/OCDB");
   reco.SetSpecificStorage("GRP/GRP/Data",
 			  Form("local://%s/../backgr",gSystem->pwd()));
 
diff --git a/test/merge/signal/sim.C b/test/merge/signal/sim.C
index caf87243200..4e1a82c6328 100644
--- a/test/merge/signal/sim.C
+++ b/test/merge/signal/sim.C
@@ -3,7 +3,7 @@ void sim(Int_t nev=1) {
   simulator.MergeWith("../backgr/galice.root",3);
   simulator.SetWriteRawData("ALL","raw.root",kTRUE);
 
-  simulator.SetDefaultStorage("local://$ALICE_ROOT");
+  simulator.SetDefaultStorage("local://$ALICE_ROOT/OCDB");
   simulator.SetSpecificStorage("GRP/GRP/Data",
 			       Form("local://%s",gSystem->pwd()));
 
diff --git a/test/pileup/rec.C b/test/pileup/rec.C
index 5260ff5c74e..ebed8d3fbee 100644
--- a/test/pileup/rec.C
+++ b/test/pileup/rec.C
@@ -10,7 +10,7 @@ void rec() {
   reco.SetWriteESDfriend();
   reco.SetWriteAlignmentData();
 
-  reco.SetDefaultStorage("local://$ALICE_ROOT");
+  reco.SetDefaultStorage("local://$ALICE_ROOT/OCDB");
   reco.SetSpecificStorage("GRP/GRP/Data",
 			  Form("local://%s",gSystem->pwd()));
 
diff --git a/test/pileup/sim.C b/test/pileup/sim.C
index aa82099964f..089ef8ca480 100644
--- a/test/pileup/sim.C
+++ b/test/pileup/sim.C
@@ -13,7 +13,7 @@ void sim(Int_t nev=5) {
     simulator.SetWriteRawData("ALL","raw.root",kTRUE);
   }
 
-  simulator.SetDefaultStorage("local://$ALICE_ROOT");
+  simulator.SetDefaultStorage("local://$ALICE_ROOT/OCDB");
   simulator.SetSpecificStorage("GRP/GRP/Data",
 			       Form("local://%s",gSystem->pwd()));
  
diff --git a/test/ppbench/rec.C b/test/ppbench/rec.C
index f44ec250c37..227c4bf11d8 100644
--- a/test/ppbench/rec.C
+++ b/test/ppbench/rec.C
@@ -4,13 +4,13 @@ void rec() {
   reco.SetWriteESDfriend();
   reco.SetWriteAlignmentData();
 
-  reco.SetDefaultStorage("local://$ALICE_ROOT");
+  reco.SetDefaultStorage("local://$ALICE_ROOT/OCDB");
   reco.SetSpecificStorage("GRP/GRP/Data",
 			  Form("local://%s",gSystem->pwd()));
 
   reco.SetRunQA("ALL:ALL") ;
   
-  AliQA::SetQARefStorage("local://$ALICE_ROOT") ;
+  AliQA::SetQARefStorage("local://$ALICE_ROOT/OCDB") ;
   
   for (Int_t det = 0 ; det < AliQA::kNDET ; det++) {
     reco.SetQACycles(det, 999) ;
diff --git a/test/ppbench/recraw/rec.C b/test/ppbench/recraw/rec.C
index b1f2cfa8088..0e035a40213 100644
--- a/test/ppbench/recraw/rec.C
+++ b/test/ppbench/recraw/rec.C
@@ -10,7 +10,7 @@ void rec() {
 
   reco.SetNumberOfEventsPerFile(-1); // all events in one single file
 
-  reco.SetDefaultStorage("local://$ALICE_ROOT");
+  reco.SetDefaultStorage("local://$ALICE_ROOT/OCDB");
   reco.SetSpecificStorage("GRP/GRP/Data",
 			  Form("local://%s/..",gSystem->pwd()));
 
diff --git a/test/ppbench/sim.C b/test/ppbench/sim.C
index 7c3eda7d606..8749c865236 100644
--- a/test/ppbench/sim.C
+++ b/test/ppbench/sim.C
@@ -6,11 +6,11 @@ void sim(Int_t nev=20) {
   simulator.SetMakeDigitsFromHits("ITS TPC");
   simulator.SetWriteRawData("ALL","raw.root",kTRUE);
 
-  simulator.SetDefaultStorage("local://$ALICE_ROOT");
+  simulator.SetDefaultStorage("local://$ALICE_ROOT/OCDB");
   simulator.SetSpecificStorage("GRP/GRP/Data",
 			       Form("local://%s",gSystem->pwd()));
   simulator.SetRunQA("ALL:ALL") ; 
-  AliQA::SetQARefStorage("local://$ALICE_ROOT") ;
+  AliQA::SetQARefStorage("local://$ALICE_ROOT/OCDB") ;
   
   for (Int_t det = 0 ; det < AliQA::kNDET ; det++) {
     simulator.SetQACycles(det, nev+1) ;
diff --git a/test/pploadlibs/rec.C b/test/pploadlibs/rec.C
index 1dddd908c14..09205ee4910 100644
--- a/test/pploadlibs/rec.C
+++ b/test/pploadlibs/rec.C
@@ -7,7 +7,7 @@ void rec() {
   reco.SetWriteESDfriend();
   reco.SetWriteAlignmentData();
 
-  reco.SetDefaultStorage("local://$ALICE_ROOT");
+  reco.SetDefaultStorage("local://$ALICE_ROOT/OCDB");
   reco.SetSpecificStorage("GRP/GRP/Data",
 			  Form("local://%s",gSystem->pwd()));
 
diff --git a/test/pploadlibs/sim.C b/test/pploadlibs/sim.C
index a5e0415ced1..a38496907ae 100644
--- a/test/pploadlibs/sim.C
+++ b/test/pploadlibs/sim.C
@@ -6,7 +6,7 @@ void sim(Int_t nev=20) {
   simulator.SetMakeSDigits("TRD TOF PHOS HMPID EMCAL MUON FMD ZDC PMD T0 VZERO");
   simulator.SetMakeDigitsFromHits("ITS TPC");
  
-  simulator.SetDefaultStorage("local://$ALICE_ROOT");
+  simulator.SetDefaultStorage("local://$ALICE_ROOT/OCDB");
   simulator.SetSpecificStorage("GRP/GRP/Data",
 			       Form("local://%s",gSystem->pwd()));
   TStopwatch timer;
-- 
2.39.3