Issues with single dataset treated as multiple ones

config/Makefile.in

@@ -58,6 +58,10 @@ XPMLIB         := @xpmlib@
 XFTLIB         := @enable_xft@
 
 BUILDCOCOA     := @buildcocoa@
+MACOSXVERS     := @macosxvers@
+OSXSDK         := @osxsdk@
+IOSVERS        := @iosvers@
+IOSSDK         := @iossdk@
 
 CXX11          := @c++11@
 

config/Makefile.ios

@@ -15,14 +15,7 @@ NOOPT         =
 endif
 
 # iOS version
-ifeq ($(IPHONEOS_DEPLOYMENT_TARGET),)
-IOSVERS       = 5.1
-else
-IOSVERS       = $(IPHONEOS_DEPLOYMENT_TARGET)
-endif
-XCODE_PATH   := $(shell /usr/bin/xcode-select -print-path)
 IOS_MAJOR    := $(shell echo $(IOSVERS) | cut -d . -f 1)
-IOSSDK       := $(XCODE_PATH)/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS$(IOSVERS).sdk
 
 # Compiler:
 ifeq ($(subst $(IOS_MAJOR),,1234),1234)
@@ -100,7 +93,4 @@ showld:
 
 showf77:
 	@echo "$(F77)"
-
-showsdk:
-	@echo "$(IOSSDK)"
 endif

config/Makefile.iossim

@@ -15,14 +15,7 @@ NOOPT         =
 endif
 
 # iOS version
-ifeq ($(IPHONEOS_DEPLOYMENT_TARGET),)
-IOSVERS       = 5.1
-else
-IOSVERS       = $(IPHONEOS_DEPLOYMENT_TARGET)
-endif
-XCODE_PATH   := $(shell /usr/bin/xcode-select -print-path)
 IOS_MAJOR    := $(shell echo $(IOSVERS) | cut -d . -f 1)
-IOSSDK       := $(XCODE_PATH)/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator$(IOSVERS).sdk
 
 # Compiler:
 ifeq ($(subst $(IOS_MAJOR),,1234),1234)
@@ -100,7 +93,4 @@ showld:
 
 showf77:
 	@echo "$(F77)"
-
-showsdk:
-	@echo "$(IOSSDK)"
 endif

config/Makefile.macosx

@@ -21,13 +21,6 @@ endif
 MACOSX_MINOR := $(shell sw_vers | sed -n 's/ProductVersion://p' | cut -d . -f 2)
 MACOSX_CPU   := $(shell uname -p)
 FINK_DIR     := $(shell which fink 2>&1 | sed -ne "s/\/bin\/fink//p")
-ifeq ($(MACOSX_DEPLOYMENT_TARGET),)
-MACOSXVERS    = 10.$(MACOSX_MINOR)
-else
-MACOSXVERS    = $(MACOSX_DEPLOYMENT_TARGET)
-endif
-XCODE_PATH   := $(shell /usr/bin/xcode-select -print-path)
-OSXSDK       := $(XCODE_PATH)/Platforms/MacOSX.platform/Developer/SDKs/MacOSX$(MACOSXVERS).sdk
 
 # Compiler:
 # From "Apple clang version ... (based on LLVM 3.0svn)"
@@ -170,7 +163,4 @@ showld:
 
 showf77:
 	@echo "$(F77ORG)"
-
-showsdk:
-	@echo "$(OSXSDK)"
 endif

config/Makefile.macosx64

@@ -21,13 +21,6 @@ endif
 MACOSX_MINOR := $(shell sw_vers | sed -n 's/ProductVersion://p' | cut -d . -f 2)
 MACOSX_CPU   := $(shell uname -p)
 FINK_DIR     := $(shell which fink 2>&1 | sed -ne "s/\/bin\/fink//p")
-ifeq ($(MACOSX_DEPLOYMENT_TARGET),)
-MACOSXVERS    = 10.$(MACOSX_MINOR)
-else
-MACOSXVERS    = $(MACOSX_DEPLOYMENT_TARGET)
-endif
-XCODE_PATH   := $(shell /usr/bin/xcode-select -print-path)
-OSXSDK       := $(XCODE_PATH)/Platforms/MacOSX.platform/Developer/SDKs/MacOSX$(MACOSXVERS).sdk
 
 # Compiler:
 # From "Apple clang version ... (based on LLVM 3.0svn)"
@@ -155,7 +148,4 @@ showld:
 
 showf77:
 	@echo "$(F77ORG)"
-
-showsdk:
-	@echo "$(OSXSDK)"
 endif

config/Makefile.macosxicc

@@ -18,13 +18,6 @@ endif
 MACOSX_MINOR := $(shell sw_vers | sed -n 's/ProductVersion://p' | cut -d . -f 2)
 MACOSX_CPU   := $(shell uname -p)
 FINK_DIR     := $(shell which fink 2>&1 | sed -ne "s/\/bin\/fink//p")
-ifeq ($(MACOSX_DEPLOYMENT_TARGET),)
-MACOSXVERS    = 10.$(MACOSX_MINOR)
-else
-MACOSXVERS    = $(MACOSX_DEPLOYMENT_TARGET)
-endif
-XCODE_PATH   := $(shell /usr/bin/xcode-select -print-path)
-OSXSDK       := $(XCODE_PATH)/Platforms/MacOSX.platform/Developer/SDKs/MacOSX$(MACOSXVERS).sdk
 
 # Compiler:
 CXX           = icc
@@ -170,7 +163,4 @@ showld:
 
 showf77:
 	@echo "$(F77ORG)"
-
-showsdk:
-	@echo "$(OSXSDK)"
 endif

configure

@@ -1609,6 +1609,7 @@ with options, prefix with --with-, enables corresponding support
   globus-libdir      Globus support, location of globus libraries
   hdfs-incdir        HDFS support, location of hdfs.h
   hdfs-libdir        HDFS support, location of libhdfs
+  iosvers            iOS SDK version (6.1, 7.0), default will be latest SDK
   jni-incdir         HDFS support, location of JNI headers
   jvm-libdir         HDFS support, location of JVM library
   krb5               Kerberos5 support, location of Kerberos distribution
@@ -1617,6 +1618,7 @@ with options, prefix with --with-, enables corresponding support
   ldap-incdir        LDAP support, location of ldap.h
   ldap-libdir        LDAP support, location of libldap
   llvm-config        LLVM/clang for cling, location of llvm-config script
+  macosxvers         OS X SDK version (10.8, 10.9), default will be latest SDK
   monalisa-incdir    Monalisa support, location of ApMon.h
   monalisa-libdir    Monalisa support, location of libapmoncpp
   mysql-incdir       MySQL support, location of mysql.h
@@ -1773,15 +1775,29 @@ solaris64CC5)
    checklib64="yes" ;;
 macosx*)
    logmsg "Will check for compatible libraries"
-   checklibcompat="yes" ;;
+   checklibcompat="yes"
+   if test "x$macosxvers" = "x"; then
+      # get most recent SDK version
+      macosxminor=`sw_vers | sed -n 's/ProductVersion://p' | cut -d . -f 2`
+      macosxvers=10.$macosxminor
+      # make available to conftest.mk scripts
+      export MACOSXVERS=$macosxvers
+   fi
+   ;;
 ios*)
    logmsg "Will check iOS SDK libraries"
    message "Checking for iOS SDK"
-   iossdk=`make -s -f ${ac_srcdir}/config/Makefile.$arch CONFIGURE=yes showsdk`
+   if test "x$iosvers" = "x"; then
+      # get most recent SDK version
+      iosvers=`xcodebuild -showsdks | sed -n '/iphoneos/s/.*iOS //p' | sed 's/ .*//'|awk 'END{print}'`
+   fi
+   xcodepath=`/usr/bin/xcode-select -print-path`
+   iossdk=$xcodepath/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS$iosvers.sdk
    result "$iossdk"
    if [ ! -d $iossdk ]; then
        result "`basename $0`: no iOS SDK found at $iossdk"
        result "Run "xcode-select" to update the developer directory path"
+       result "or make sure the desired SDK version is installed"
        exit 1
    fi
    enable_cintex="no"
@@ -1953,6 +1969,7 @@ if test $# -gt 0 ; then
       --with-gccxml=*)         gccxml=$optarg        ;;
       --with-hdfs-incdir=*)    hdfsincdir=$optarg    ; enable_hdfs="yes"    ;;
       --with-hdfs-libdir=*)    hdfslibdir=$optarg    ; enable_hdfs="yes"    ;;
+      --with-iosvers=*)        iosvers=$optarg       ;;
       --with-jni-incdir=*)     jniincdir=$optarg     ;;
       --with-jvm-libdir=*)     jvmlibdir=$optarg     ;;
       --with-krb5=*)           krb5dir=$optarg       ; enable_krb5="yes"    ;;
@@ -1961,6 +1978,7 @@ if test $# -gt 0 ; then
       --with-ldap-incdir=*)    ldapincdir=$optarg    ; enable_ldap="yes"    ;;
       --with-ldap-libdir=*)    ldaplibdir=$optarg    ; enable_ldap="yes"    ;;
       --with-llvm-config=*)    llvmconfig=$optarg    ;; # require explicit --enable-cling
+      --with-macosxvers=*)     macosxvers=$optarg    ;;
       --with-mysql-incdir=*)   mysqlincdir=$optarg   ; enable_mysql="yes"   ;;
       --with-mysql-libdir=*)   mysqllibdir=$optarg   ; enable_mysql="yes"   ;;
       --with-monalisa-incdir=*)monalisaincdir=$optarg; enable_monalisa="yes";;
@@ -2361,11 +2379,13 @@ if test "x$enable_cocoa" = "xyes"; then
     enable_x11="no"
     result "yes"
     message "Checking for OSX SDK"
-    osxsdk=`make -s -f ${ac_srcdir}/config/Makefile.$arch CONFIGURE=yes showsdk`
+    xcodepath=`/usr/bin/xcode-select -print-path`
+    osxsdk=$xcodepath/Platforms/MacOSX.platform/Developer/SDKs/MacOSX$macosxvers.sdk
     result "$osxsdk"
     if [ ! -d $osxsdk ]; then
         result "`basename $0`: no OSX SDK found at $osxsdk"
         result "Run "xcode-select" to update the developer directory path"
+        result "or make sure the desired SDK version is installed"
         exit 1
     else
         openglincdir=${osxsdk}/System/Library/Frameworks/OpenGL.framework/Headers
@@ -6708,6 +6728,8 @@ sed -e "s|@globusincdir@|$globusincdir|"        \
     -e "s|@hdfsincdir@|$hdfsincdir|"            \
     -e "s|@hdfslib@|$hdfslib|"                  \
     -e "s|@hdfslibdir@|$hdfslibdir|"            \
+    -e "s|@iossdk@|$iossdk|"                    \
+    -e "s|@iosvers@|$iosvers|"                  \
     -e "s|@iconpath@|$iconpath|"                \
     -e "s|@incdir@|$incdir|"                    \
     -e "s|@jniincdir@|$jniincdir|g"             \
@@ -6724,6 +6746,7 @@ sed -e "s|@globusincdir@|$globusincdir|"        \
     -e "s|@ldflags@||"                          \
     -e "s|@libdir@|$libdir|"                    \
     -e "s|@llvmconfig@|$llvmconfig|"            \
+    -e "s|@macosxvers@|$macosxvers|"            \
     -e "s|@macrodir@|$macrodir|"                \
     -e "s|@mandir@|$mandir|"                    \
     -e "s|@mkliboption@|$mkliboption|"          \
@@ -6754,6 +6777,7 @@ sed -e "s|@globusincdir@|$globusincdir|"        \
     -e "s|@oracleincdir@|$oracleincdir|"        \
     -e "s|@oraclelib@|$oraclelib|"              \
     -e "s|@oraclelibdir@|$oraclelibdir|"        \
+    -e "s|@osxsdk@|$osxsdk|"                    \
     -e "s|@pgsqlincdir@|$pgsqlincdir|"          \
     -e "s|@pgsqllib@|$pgsqllib|"                \
     -e "s|@pgsqllibdir@|$pgsqllibdir|"          \

core/base/inc/TStyle.h

@@ -160,7 +160,12 @@ class TStyle : public TNamed, public TAttLine, public TAttFill, public TAttMarke
    TStyle(const char *name, const char *title);
    TStyle(const TStyle &style);
    virtual          ~TStyle();
-   Int_t            AxisChoice(Option_t *axis) const;
+   inline Int_t     AxisChoice(Option_t *axis) const {
+      // Return axis number (1 for X, 2 for Y, 3 for Z)
+      UChar_t a = *axis;
+      a -= (a >= 'x') ? 'x' : 'X'; // toupper and a-='X'; intentional underflow
+      return (a > 2) ? 0 : (Int_t)(a+1);
+   };
    virtual void     Browse(TBrowser *b);
    static  void     BuildStyles();
    virtual void     Copy(TObject &style) const;

core/base/src/TStyle.cxx

@@ -696,19 +696,6 @@ void TStyle::Reset(Option_t *opt)
 }
 
 
-//______________________________________________________________________________
-Int_t TStyle::AxisChoice( Option_t *axis) const
-{
-   // Return axis number.
-
-   char achoice = toupper(axis[0]);
-   if (achoice == 'X') return 1;
-   if (achoice == 'Y') return 2;
-   if (achoice == 'Z') return 3;
-   return 0;
-}
-
-
 //______________________________________________________________________________
 Int_t TStyle::GetNdivisions( Option_t *axis) const
 {

core/meta/inc/TStreamerElement.h

@@ -68,7 +68,8 @@ class TStreamerElement : public TNamed {
       kRepeat       = BIT(10),
       kRead         = BIT(11),
       kWrite        = BIT(12),
-      kDoNotDelete  = BIT(13)
+      kDoNotDelete  = BIT(13),
+      kWholeObject  = BIT(14)
    };
 
    TStreamerElement();

core/meta/src/TStreamerElement.cxx

@@ -314,6 +314,11 @@ void TStreamerElement::GetSequenceType(TString &sequenceType) const
 
    sequenceType.Clear();
    Bool_t first = kTRUE;
+   if (TestBit(TStreamerElement::kWholeObject)) {
+      if (!first) sequenceType += ",";
+      first = kFALSE;
+      sequenceType += "wholeObject";
+   }
    if (TestBit(TStreamerElement::kCache)) {
       first = kFALSE;
       sequenceType += "cached";

geom/geom/inc/TGeoBranchArray.h

@@ -38,7 +38,7 @@ class TGeoBranchArray : public TObject
    TObject          *fClient;         // Client object to notify
 
 public:
-   TGeoBranchArray() : TObject(), fLevel(0), fMaxLevel(10), fArray(NULL), fMatrix(NULL), fClient(NULL) {}
+   TGeoBranchArray() : TObject(), fLevel(-1), fMaxLevel(10), fArray(NULL), fMatrix(NULL), fClient(NULL) {}
    TGeoBranchArray(Int_t level);
    virtual ~TGeoBranchArray();
 
@@ -64,6 +64,7 @@ class TGeoBranchArray : public TObject
    void              Init(TGeoNode **branch, TGeoMatrix *global, Int_t level);
    void              InitFromNavigator(TGeoNavigator *nav);
    virtual Bool_t    IsSortable() const {return kTRUE;}
+   Bool_t            IsOutside() const {return (fLevel<0)?kTRUE:kFALSE;}
    virtual Bool_t    Notify() {return (fClient)?fClient->Notify():kFALSE;}
    virtual void      Print(Option_t *option="") const;
    void              SetClient(TObject *client) {fClient = client;}

geom/geom/inc/TGeoNavigator.h

@@ -183,6 +183,7 @@ public :
 //   void                   SetNormalChecked(Double_t norm) {fNormalChecked=norm;}
    void                   SetCldirChecked(Double_t *dir) {memcpy(fCldirChecked, dir, 3*sizeof(Double_t));}
    void                   SetLastSafetyForPoint(Double_t safe, const Double_t *point) {fLastSafety=safe; memcpy(fLastPoint,point,3*sizeof(Double_t));}
+   void                   SetLastSafetyForPoint(Double_t safe, Double_t x, Double_t y, Double_t z) {fLastSafety=safe; fLastPoint[0]=x; fLastPoint[1]=y, fLastPoint[2]=z;}
 
    //--- point/vector reference frame conversion
    void                   LocalToMaster(const Double_t *local, Double_t *master) const {fCache->LocalToMaster(local, master);}

geom/geom/src/TGeoArb8.cxx

@@ -645,25 +645,29 @@ Double_t TGeoArb8::DistFromInside(const Double_t *point, const Double_t *dir, In
 {
 // Compute distance from inside point to surface of the shape.
    Int_t i;
-   Double_t dist[6];
-   dist[0]=dist[1]=TGeoShape::Big();
+   Double_t distz = TGeoShape::Big();
+   Double_t distl = TGeoShape::Big();
+   Double_t dist;
+   Double_t pt[3] = {0.,0.,0.};
    if (dir[2]<0) {
-      dist[0]=(-fDz-point[2])/dir[2];
+      distz=(-fDz-point[2])/dir[2];
+      pt[2] = -fDz;
    } else {
-      if (dir[2]>0) dist[1]=(fDz-point[2])/dir[2];
+      if (dir[2]>0) distz=(fDz-point[2])/dir[2];
+      pt[2] = fDz;
    }
    for (i=0; i<4; i++) {
-      dist[i+2]=DistToPlane(point, dir, i, kTRUE);
-   }   
-      
-   Double_t distmin = dist[0];
-   for (i=1;i<6;i++) if (dist[i] < distmin) distmin = dist[i];
-   if (distmin<0) return 0.;
-   if (distmin>1E10) {
-      Error("DistFromInside", "Big value from point=(%19.16f, %19.16f, %19.16f) dir=(%19.16f, %19.16f, %19.16f)\n", 
-            point[0],point[1],point[2],dir[0],dir[1],dir[2]);
-   }         
-   return distmin;
+      dist=DistToPlane(point, dir, i, kTRUE);
+      if (dist<distl) distl = dist;
+   }
+   if (distz<distl) {
+      pt[0] = point[0]+distz*dir[0];
+      pt[1] = point[1]+distz*dir[1];
+      if (!Contains(pt)) distz = TGeoShape::Big();
+   }
+   dist = TMath::Min(distz, distl);
+   if (dist<0 || dist>1.E10) return 0.;   
+   return dist;
 #ifdef OLDALGORITHM
 //#else
 // compute distance to plane ipl :

geom/geom/src/TGeoBranchArray.cxx

@@ -104,7 +104,7 @@ TGeoBranchArray& TGeoBranchArray::operator=(const TGeoBranchArray& other)
 void TGeoBranchArray::AddLevel(Int_t dindex)
 {
 // Add and extra daughter to the current path array. No validity check performed !
-   if (!fLevel) {
+   if (fLevel<=0) {
       Error("AddLevel", "You must initialize from navigator or copy from another branch array first.");
       return;
    }
@@ -251,6 +251,7 @@ void TGeoBranchArray::InitFromNavigator(TGeoNavigator *nav)
    }
    fLevel = level;
    memcpy(fArray, branch, (fLevel+1)*sizeof(TGeoNode*));
+   if (nav->IsOutside()) fLevel = -1;
 }
 
 //______________________________________________________________________________
@@ -290,5 +291,6 @@ void TGeoBranchArray::UpdateNavigator(TGeoNavigator *nav) const
 {
 // Update the navigator to reflect the branch.
    nav->CdTop();
+   if (fLevel<0) {nav->SetOutside(kTRUE); return;}
    for (Int_t i=1; i<fLevel+1; i++) nav->CdDown(fArray[i]);
 }

geom/geom/src/TGeoShape.cxx

@@ -480,7 +480,7 @@ Double_t TGeoShape::SafetySeg(Double_t r, Double_t z, Double_t r1, Double_t z1,
    crossp *= (outer) ? 1. : -1.;
    // Positive crossp means point on the requested side of the (1,2) segment
    if (crossp < 0) {
-      if (((z-z1)*(z2-z)) > 0) return 0;
+      if (((z-z1)*(z2-z)) > -1.E-10) return 0;
       return TGeoShape::Big();
    }   
    // Compute (1,P) dot (1,2)