merge from roostats development branch the changes

done in revision 37151


git-svn-id: http://root.cern.ch/svn/root/trunk@37153 27541ba8-7e3a-0410-8455-c3a389f83636

roofit/histfactory/Module.mk

@@ -105,9 +105,9 @@ $(HF_MAKEWORKSPACEEXE): $(HF_MAKEWORKSPACEEXEO) $(ROOTLIBSDEP) $(RINTLIB) $(HIST
 		$(LD) $(LDFLAGS) -o $@ $(HF_MAKEWORKSPACEEXEO)  $(ROOTICON) $(BOOTULIBS)  \
 		   $(ROOTULIBS) $(RPATH) $(ROOTLIBS)  $(RINTLIBS) $(HF_LIBS)  $(SYSLIBS)  
 
-$(HF_PREPAREHISTFACTORY) : 
-		chmod +x $(MODDIRC)/prepareHistFactory 
+$(HF_PREPAREHISTFACTORY) : $(MODDIRC)/prepareHistFactory
 		cp $(MODDIRC)/prepareHistFactory $@
+		chmod +x $@
 
 
 ALLEXECS     += $(HF_MAKEWORKSPACEEXE) 

roofit/histfactory/config/prepareHistFactory

@@ -24,12 +24,12 @@ mkdir -p $DIR/results
 
 echo "Copying skeleton configuration files..."
 cp $ROOTSYS/etc/HistFactorySchema.dtd $DIR/config/
-cp $ROOTSYS/etc/example.xml $DIR/config/
-cp $ROOTSYS/etc/example_channel.xml $DIR/config/
+cp $ROOTSYS/tutorials/histfactory/example.xml $DIR/config/
+cp $ROOTSYS/tutorials/histfactory/example_channel.xml $DIR/config/
 
 #echo "Making skeleton data files..."
-#cp $ROOTSYS/etc/makeExample.C $DIR/data/
-#root -b makeExample.C
+root -b -q $ROOTSYS/tutorials/histfactory/makeExample.C
+mv example.root $DIR/data
 
 echo "Done!"
 #echo "You can run the example with: hist2workspace $DIR/config/example.xml"

roofit/histfactory/config/example.xml → tutorials/histfactory/example.xml

@@ -9,7 +9,7 @@
     NormalizedByTheory should be "True" (not "TRUE" or "true") for all non-data-driven background
 -->
 
-<!DOCTYPE Combination  SYSTEM 'Config.dtd'>
+<!DOCTYPE Combination  SYSTEM 'HistFactorySchema.dtd'>
 
 <Combination OutputFilePrefix="./results/example" Mode="comb" >
 

roofit/histfactory/config/example_channel.xml → tutorials/histfactory/example_channel.xml

-<!DOCTYPE Channel  SYSTEM 'Config.dtd'>
+<!DOCTYPE Channel  SYSTEM 'HistFactorySchema.dtd'>
 
   <Channel Name="channel1" InputFile="./data/example.root" HistoName="" >
     <!--<Data Name="data" InputFile="" HistoPath="" HistoName=""/>-->