OADB classes and root files for the physics selection
authormfloris <mfloris@f7af4fe6-9843-0410-8265-dc069ae4e863>
Tue, 12 Apr 2011 09:12:38 +0000 (09:12 +0000)
committermfloris <mfloris@f7af4fe6-9843-0410-8265-dc069ae4e863>
Tue, 12 Apr 2011 09:12:38 +0000 (09:12 +0000)
OADB/AliOADBContainer.cxx
OADB/AliOADBContainer.h
OADB/CMakelibOADB.pkg
OADB/COMMON/PHYSICSSELECTION/data/physicsSelection.root [new file with mode: 0644]
OADB/OADBLinkDef.h
OADB/PWG2/SPECTRA/spectraResults.root

index f1f8183e5492a4de0ff01929f39dcce903f8403a..30bf5b713ad8f4ae12065069dd8df51263d46a0d 100644 (file)
@@ -171,7 +171,7 @@ void AliOADBContainer::UpdateObject(Int_t idx, TObject* obj, Int_t lower, Int_t
   // Check that there is no overlap with existing run ranges  
   Int_t index = HasOverlap(lower, upper);
   if (index != -1) {
-    AliFatal(Form("Ambiguos validity range (%5d) !\n", index));
+    AliFatal(Form("Ambiguos validity range (%5d, %5.5d-%5.5d) !\n", index,lower,upper));
     return;
   }
   //
@@ -218,7 +218,7 @@ Int_t AliOADBContainer::GetIndexForRun(Int_t run) const
   return index;
 }
 
-TObject* AliOADBContainer::GetObject(Int_t run, char* def) const
+TObject* AliOADBContainer::GetObject(Int_t run, const char* def) const
 {
   // Return object for given run or default if not found
   TObject* obj = 0;
index b6a5922ca879ede5b0d90488b2dc185b642d3c51..6dfd6c988eb7542de28870d138456d60a561cfd4 100644 (file)
@@ -40,9 +40,9 @@ class AliOADBContainer : public TNamed {
   Int_t GetNumberOfEntries()    const {return fEntries;}
   Int_t LowerLimit(Int_t idx)   const {return fLowerLimits[idx];}
   Int_t UpperLimit(Int_t idx)   const {return fUpperLimits[idx];}
-  TObject* GetObject(Int_t run, char* def = "") const;
+  TObject* GetObject(Int_t run, const char* def = "") const;
   TObject* GetObjectByIndex(Int_t run) const;
-  TObject* GetDefaultObject(char* key) 
+  TObject* GetDefaultObject(const char* key) 
   {return(fDefaultList->FindObject(key));}
 // Debugging  
   void List();
index b43cfe74a92504f1e2c7dcd92c0d05578f7c5577..d10b3c5e6a31ac4e474173d7c40cbb139cc7cdf9 100644 (file)
@@ -1,5 +1,5 @@
 #-*- Mode: CMake -*-
-set ( SRCS  AliOADBContainer.cxx AliOADBCentrality.cxx AliOADBPWG2Spectra.cxx)
+set ( SRCS  AliOADBContainer.cxx AliOADBCentrality.cxx  AliOADBPWG2Spectra.cxx AliOADBPhysicsSelection.cxx AliOADBFillingScheme.cxx)
 
 string(REPLACE ".cxx" ".h" HDRS  "${SRCS}")
 
diff --git a/OADB/COMMON/PHYSICSSELECTION/data/physicsSelection.root b/OADB/COMMON/PHYSICSSELECTION/data/physicsSelection.root
new file mode 100644 (file)
index 0000000..89bb0c7
Binary files /dev/null and b/OADB/COMMON/PHYSICSSELECTION/data/physicsSelection.root differ
index 60f680750d27da8f60ea2d38804d7191b9e2ab3f..6e4e3026e1c5ad54caafa776a8825ea8e30b2164 100644 (file)
@@ -11,5 +11,8 @@
 
 #pragma link C++ class AliOADBContainer+;
 #pragma link C++ class AliOADBCentrality+;
+#pragma link C++ class AliOADBPhysicsSelection+;
+#pragma link C++ class AliOADBFillingScheme+;
 #pragma link C++ class AliOADBPWG2Spectra+;
+
 #endif
index 54977a4fe225075a07ec98e08ef3cd122ae385bf..055a8f2e443fe0e476daa9c64dbea696e5083a7e 100644 (file)
Binary files a/OADB/PWG2/SPECTRA/spectraResults.root and b/OADB/PWG2/SPECTRA/spectraResults.root differ