Merge branch 'master' of https://git.cern.ch/reps/AliRoot
authormweber <physics@pb-d-128-141-49-189.cern.ch>
Tue, 10 Dec 2013 16:47:32 +0000 (17:47 +0100)
committermweber <physics@pb-d-128-141-49-189.cern.ch>
Tue, 10 Dec 2013 16:47:32 +0000 (17:47 +0100)
HLT/TRD/AliTRDonlineTrackingDataContainer.cxx
MUON/runSimulation.C
OCDB/TRD/Calib/TrapConfig/Run0_999999999_v0_s0.root
PWGCF/EBYE/BalanceFunctions/AliBalancePsi.h
PWGCF/EBYE/BalanceFunctions/test.txt [new file with mode: 0644]
PWGPP/TRD/AliTRDonlineTrackletFilter.cxx
TRD/AliTRDgtuParam.h
TRD/AliTRDtrapConfig.h

index 9d945677502889c3921fd6a1701f4ac731dfc9a6..8686a4c035367916f4e58282ae21946c04d0a76c 100644 (file)
@@ -643,3 +643,5 @@ Bool_t AliTRDonlineTrackingDataContainer::Decompress(const void* buffer, UInt_t
   return kTRUE;
 
 }
+
+
index 32531d86e62116f7db63271e00b33a66dda868ae..53a308c90460d9a03098d473ce388b63c493cb14 100644 (file)
@@ -21,7 +21,7 @@
 ///
 /// Macro extracted from the MUON test script
 ///
-/// \author Laurent Aphecetche
+/// \author Laurent Git Aphecetche
 
 #if !defined(__CINT__) || defined(__MAKECINT__)
 #include "AliCDBManager.h"
index 7f0a00dfc548c17c980ae5619bbd5587aae16183..d35e62fcf6d62331a2cd9ccc43ff200254959420 100644 (file)
Binary files a/OCDB/TRD/Calib/TrapConfig/Run0_999999999_v0_s0.root and b/OCDB/TRD/Calib/TrapConfig/Run0_999999999_v0_s0.root differ
index 67b2944db647d9b5dd39c45bc1a12c8c621d8abb..f81b5e42db9978572ec25d0641209203d23380bc 100644 (file)
@@ -11,7 +11,7 @@
 //
 //    Origin: Panos Christakoglou, Nikhef, Panos.Christakoglou@cern.ch
 //-------------------------------------------------------------------------
-
+// test
 #include <vector>
 #include <TObject.h>
 #include "TString.h"
diff --git a/PWGCF/EBYE/BalanceFunctions/test.txt b/PWGCF/EBYE/BalanceFunctions/test.txt
new file mode 100644 (file)
index 0000000..e69de29
index 40aaf880e4b9f7abbaaf3dd466bb4f4235466f8f..3c67da4c751633dbbe8643f0252297afe01fd1f7 100644 (file)
@@ -1,3 +1,5 @@
+
+
 // AliTRDonlineTrackletFilter implements an analysis task which reads
 // the tracklets from the TRD.Tracklets.root file and makes them
 // available to other analysis tasks. This allows to access the full
index 228cd95fe1798d490a2b4a6c6fd8e3780a928eac..4cfe0baf64abc4e07e3b6bc886d194a6c802236e 100644 (file)
@@ -1,3 +1,5 @@
+
+
 #ifndef ALITRDGTUPARAM_H
 #define ALITRDGTUPARAM_H
 /* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. *
index 777710a49608c6e74beeab3d47a87ce0168c3e44..e1d2d96d3d56532fb90184355276279920d87375 100644 (file)
@@ -1,3 +1,5 @@
+
+
 #ifndef ALITRDTRAPCONFIG_H
 #define ALITRDTRAPCONFIG_H
 /* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. *