Updating default value for beamType from DAQ logbook ("Cosmics" instead of "cosmic").
authorzampolli <zampolli@f7af4fe6-9843-0410-8265-dc069ae4e863>
Mon, 10 Aug 2009 09:53:45 +0000 (09:53 +0000)
committerzampolli <zampolli@f7af4fe6-9843-0410-8265-dc069ae4e863>
Mon, 10 Aug 2009 09:53:45 +0000 (09:53 +0000)
Adding dummy files for CTP (from R. Lietava).
Modifying macro to create dummy files taking new ones (see above).

GRP/MakeCTPDummyEntries.C
OCDB/GRP/CTP/DummyConfig/Run0_999999999_v0_s0.root [new file with mode: 0644]
OCDB/GRP/CTP/DummyScalers/Run0_999999999_v0_s0.root [new file with mode: 0644]
STEER/AliGRPPreprocessor.cxx

index 68c11be..6bf0c36 100644 (file)
@@ -6,8 +6,8 @@ void MakeCTPDummyEntries(){
 
        AliCDBManager *man = AliCDBManager::Instance();
        man->SetDefaultStorage("local://$ALICE_ROOT/OCDB");
-       Char_t * filenameConfig = gSystem->ExpandPathName("$ALICE_ROOT/GRP/CTP/p-p.cfg");
-       Char_t * filenameScalers = gSystem->ExpandPathName("$ALICE_ROOT/GRP/CTP/xcounters.txt");
+       Char_t * filenameConfig = gSystem->ExpandPathName("$ALICE_ROOT/GRP/CTP/stdln.cfg");
+       Char_t * filenameScalers = gSystem->ExpandPathName("$ALICE_ROOT/GRP/CTP/stdln.cnt");
 
        AliTriggerConfiguration *runcfg = AliTriggerConfiguration::LoadConfiguration(filenameConfig);
        AliTriggerRunScalers *scalers = AliTriggerRunScalers::ReadScalers(filenameScalers);
diff --git a/OCDB/GRP/CTP/DummyConfig/Run0_999999999_v0_s0.root b/OCDB/GRP/CTP/DummyConfig/Run0_999999999_v0_s0.root
new file mode 100644 (file)
index 0000000..174e687
Binary files /dev/null and b/OCDB/GRP/CTP/DummyConfig/Run0_999999999_v0_s0.root differ
diff --git a/OCDB/GRP/CTP/DummyScalers/Run0_999999999_v0_s0.root b/OCDB/GRP/CTP/DummyScalers/Run0_999999999_v0_s0.root
new file mode 100644 (file)
index 0000000..6f12bc8
Binary files /dev/null and b/OCDB/GRP/CTP/DummyScalers/Run0_999999999_v0_s0.root differ
index 74d175c..502922b 100644 (file)
@@ -60,7 +60,7 @@ ClassImp(AliGRPPreprocessor)
 
 //_______________________________________________________________
 
-  const Int_t AliGRPPreprocessor::fgknDAQLbPar = 8; // num parameters in the logbook for PHYSICS runs, when beamType from DAQ logbook != cosmic
+  const Int_t AliGRPPreprocessor::fgknDAQLbPar = 8; // num parameters in the logbook for PHYSICS runs, when beamType from DAQ logbook != Cosmics
   const Int_t AliGRPPreprocessor::fgknDAQLbParReduced = 7; // num parameters in the logbook for the other cases
   const Int_t AliGRPPreprocessor::fgknDCSDP = 50;   // number of dcs dps
   const Int_t AliGRPPreprocessor::fgknDCSDPHallProbes = 40;   // number of dcs dps
@@ -261,7 +261,7 @@ UInt_t AliGRPPreprocessor::Process(TMap* valueMap)
        Int_t iDaqLB = ProcessDaqLB(grpobj);
        TString runType = (TString)GetRunType();
        TString beamType = (TString)GetRunParameter("beamType");
-       if((runType == "PHYSICS" && iDaqLB == fgknDAQLbPar && beamType!="cosmic") ||  (runType == "PHYSICS" && iDaqLB == fgknDAQLbParReduced && beamType=="cosmic") || (runType != "PHYSICS" && iDaqLB == fgknDAQLbParReduced)) {
+       if((runType == "PHYSICS" && iDaqLB == fgknDAQLbPar && beamType!="Cosmics") ||  (runType == "PHYSICS" && iDaqLB == fgknDAQLbParReduced && beamType=="Cosmics") || (runType != "PHYSICS" && iDaqLB == fgknDAQLbParReduced)) {
                Log(Form("DAQ Logbook, successful!"));
        } else {
                Log(Form("DAQ Logbook, could not get all expected entries!!!"));
@@ -434,12 +434,12 @@ Int_t AliGRPPreprocessor::ProcessDaqLB(AliGRPObject* grpObj)
        if (beamEnergy != 0){
                grpObj->SetBeamEnergy(beamEnergy);
                Log(Form("Beam Energy for run %d: %f",fRun, beamEnergy));
-               if ((runType == "PHYSICS" && beamType!="cosmic")){
-                       nparameter++; // increasing nparameters only in case we're in PHYSICS runs with beamType != cosmic
+               if ((runType == "PHYSICS" && beamType!="Cosmics")){
+                       nparameter++; // increasing nparameters only in case we're in PHYSICS runs with beamType != Cosmics
                }
        } 
        else {
-               if ((runType == "PHYSICS" && beamType!="cosmic")){
+               if ((runType == "PHYSICS" && beamType!="Cosmics")){
                        Log(Form("Beam Energy not put in logbook, setting to invalid in GRP entry, and producing an error (beamType = %s, runType = %s)",beamType.Data(), runType.Data()));
                }
                else{